From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([208.118.235.92]:54602) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1UKyYY-0002Ra-Sj for qemu-devel@nongnu.org; Wed, 27 Mar 2013 18:10:56 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1UKyYX-00048L-JO for qemu-devel@nongnu.org; Wed, 27 Mar 2013 18:10:54 -0400 Received: from mail.linux-iscsi.org ([67.23.28.174]:47391 helo=linux-iscsi.org) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1UKyYX-00047V-44 for qemu-devel@nongnu.org; Wed, 27 Mar 2013 18:10:53 -0400 From: "Nicholas A. Bellinger" Date: Wed, 27 Mar 2013 21:59:46 +0000 Message-Id: <1364421586-29857-4-git-send-email-nab@linux-iscsi.org> In-Reply-To: <1364421586-29857-1-git-send-email-nab@linux-iscsi.org> References: <1364421586-29857-1-git-send-email-nab@linux-iscsi.org> Subject: [Qemu-devel] [PATCH 3/3] vhost: Only call vhost_verify_ring_mappings when adding vhost memory List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: target-devel Cc: kvm-devel , "Michael S. Tsirkin" , qemu-devel , Nicholas Bellinger , lf-virt , Anthony Liguori , Stefan Hajnoczi , Paolo Bonzini , Asias He From: Nicholas Bellinger This patch fixes a bug where vhost_verify_ring_mappings() could be called after vhost_dev_unassign_memory() has been called during vhost_set_memory(..., add=false). This appears to be fallout from when dev->started = true assignment occurs before vhost_set_memory(..., add=false) is called in: commit 24f4fe345c1b80bab1ee18573914123d8028a9e6 Author: Michael S. Tsirkin Date: Tue Dec 25 17:41:07 2012 +0200 vhost: set started flag while start is in progress Cc: Michael S. Tsirkin Cc: Asias He Cc: Paolo Bonzini Signed-off-by: Nicholas Bellinger --- hw/vhost.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/hw/vhost.c b/hw/vhost.c index 4d6aee3..687a689 100644 --- a/hw/vhost.c +++ b/hw/vhost.c @@ -421,7 +421,7 @@ static void vhost_set_memory(MemoryListener *listener, return; } - if (dev->started) { + if (dev->started && add) { r = vhost_verify_ring_mappings(dev, start_addr, size); assert(r >= 0); } -- 1.7.2.5