From patchwork Fri Dec 16 20:33:27 2011 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: vhost-net: Move asserts to after check for end < start Date: Fri, 16 Dec 2011 10:33:27 -0000 From: Bruce Rogers X-Patchwork-Id: 131905 Message-Id: <1324067607-17055-1-git-send-email-brogers@suse.com> To: qemu-devel@nongnu.org Cc: Bruce Rogers , mst@redhat.com When migrating a vm using vhost-net we hit the following assertion: qemu-kvm: /usr/src/packages/BUILD/qemu-kvm-0.15.1/hw/vhost.c:30: vhost_dev_sync_region: Assertion `start / (0x1000 * (8 * sizeof(vhost_log_chunk_t))) < dev->log_size' failed. The cases which the end < start check is intended to catch, such as for vga video memory, will also likely trigger the assertion. Reorder the code to handle this correctly. Signed-off-by: Bruce Rogers --- hw/vhost.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/hw/vhost.c b/hw/vhost.c index 0870cb7..7309f71 100644 --- a/hw/vhost.c +++ b/hw/vhost.c @@ -26,11 +26,11 @@ static void vhost_dev_sync_region(struct vhost_dev *dev, vhost_log_chunk_t *to = dev->log + end / VHOST_LOG_CHUNK + 1; uint64_t addr = (start / VHOST_LOG_CHUNK) * VHOST_LOG_CHUNK; - assert(end / VHOST_LOG_CHUNK < dev->log_size); - assert(start / VHOST_LOG_CHUNK < dev->log_size); if (end < start) { return; } + assert(end / VHOST_LOG_CHUNK < dev->log_size); + assert(start / VHOST_LOG_CHUNK < dev->log_size); for (;from < to; ++from) { vhost_log_chunk_t log; int bit;