Commit e7b94a84 authored by Dr. David Alan Gilbert's avatar Dr. David Alan Gilbert Committed by Michael S. Tsirkin
Browse files

vhost: Allow adjoining regions 



My rework of section adding combines overlapping or adjoining regions,
but checks they're actually the same underlying RAM block.
Fix the case where two blocks adjoin but don't overlap; that new region
should get added (but not combined), but my previous patch was disallowing it.

Fixes: c1ece84e

Reported-by: default avatarAlex Williamson <alex.williamson@redhat.com>
Signed-off-by: default avatarDr. David Alan Gilbert <dgilbert@redhat.com>
Tested-by: default avatarAlex Williamson <alex.williamson@redhat.com>
Reviewed-by: default avatarMichael S. Tsirkin <mst@redhat.com>
Signed-off-by: default avatarMichael S. Tsirkin <mst@redhat.com>
parent ea3e6f5a

hw/virtio/vhost.c

+9 −4
Original line number Diff line number Diff line
@@ -595,6 +595,10 @@ static void vhost_region_add_section(struct vhost_dev *dev, 
                                        prev_sec->offset_within_address_space,

                                        prev_sec->offset_within_region);

            } else {

                /* adjoining regions are fine, but overlapping ones with

                 * different blocks/offsets shouldn't happen

                 */

                if (mrs_gpa != prev_gpa_end + 1) {

                    error_report("%s: Overlapping but not coherent sections "

                                 "at %"PRIx64,

                                 __func__, mrs_gpa);
@@ -602,6 +606,7 @@ static void vhost_region_add_section(struct vhost_dev *dev, 
                }

            }

        }

    }



    if (need_add) {

        ++dev->n_tmp_sections;