[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PULL 4/5] vhost: Allow adjoining regions
From: |
Michael S. Tsirkin |
Subject: |
[Qemu-devel] [PULL 4/5] vhost: Allow adjoining regions |
Date: |
Mon, 9 Apr 2018 17:42:08 +0300 |
From: "Dr. David Alan Gilbert" <address@hidden>
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: c1ece84e7c9
Reported-by: Alex Williamson <address@hidden>
Signed-off-by: Dr. David Alan Gilbert <address@hidden>
Tested-by: Alex Williamson <address@hidden>
Reviewed-by: Michael S. Tsirkin <address@hidden>
Signed-off-by: Michael S. Tsirkin <address@hidden>
---
hw/virtio/vhost.c | 13 +++++++++----
1 file changed, 9 insertions(+), 4 deletions(-)
diff --git a/hw/virtio/vhost.c b/hw/virtio/vhost.c
index b6c314e..a21a5a2 100644
--- a/hw/virtio/vhost.c
+++ b/hw/virtio/vhost.c
@@ -595,10 +595,15 @@ static void vhost_region_add_section(struct vhost_dev
*dev,
prev_sec->offset_within_address_space,
prev_sec->offset_within_region);
} else {
- error_report("%s: Overlapping but not coherent sections "
- "at %"PRIx64,
- __func__, mrs_gpa);
- return;
+ /* 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);
+ return;
+ }
}
}
}
--
MST
- [Qemu-devel] [PULL 0/5] virtio,vhost: fixes, Michael S. Tsirkin, 2018/04/09
- [Qemu-devel] [PULL 3/5] contrib/libvhost-user: add the protocol feature used for SET/GET message, Michael S. Tsirkin, 2018/04/09
- [Qemu-devel] [PULL 4/5] vhost: Allow adjoining regions,
Michael S. Tsirkin <=
- [Qemu-devel] [PULL 5/5] virtio-serial: fix heap-over-flow, Michael S. Tsirkin, 2018/04/09
- [Qemu-devel] [PULL 2/5] vhost-user: back SET/GET_CONFIG requests with a protocol feature, Michael S. Tsirkin, 2018/04/09
- [Qemu-devel] [PULL 1/5] vhost-user-blk: set config ops before vhost-user init, Michael S. Tsirkin, 2018/04/09
- Re: [Qemu-devel] [PULL 0/5] virtio,vhost: fixes, Peter Maydell, 2018/04/09