From patchwork Wed Mar 27 21:59:46 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Nicholas A. Bellinger" X-Patchwork-Id: 231852 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from lists.gnu.org (lists.gnu.org [208.118.235.17]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (Client did not present a certificate) by ozlabs.org (Postfix) with ESMTPS id 13D282C00A8 for ; Thu, 28 Mar 2013 09:12:03 +1100 (EST) Received: from localhost ([::1]:53736 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1UKyZd-0003XR-6l for incoming@patchwork.ozlabs.org; Wed, 27 Mar 2013 18:12:01 -0400 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 Received: from linux-iscsi.org (localhost [127.0.0.1]) by linux-iscsi.org (Postfix) with ESMTP id E6AC822D9D5; Wed, 27 Mar 2013 21:59:50 +0000 (UTC) From: "Nicholas A. Bellinger" To: target-devel Date: Wed, 27 Mar 2013 21:59:46 +0000 Message-Id: <1364421586-29857-4-git-send-email-nab@linux-iscsi.org> X-Mailer: git-send-email 1.7.2.5 In-Reply-To: <1364421586-29857-1-git-send-email-nab@linux-iscsi.org> References: <1364421586-29857-1-git-send-email-nab@linux-iscsi.org> X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.4.x-2.6.x [generic] X-Received-From: 67.23.28.174 Cc: kvm-devel , "Michael S. Tsirkin" , qemu-devel , Nicholas Bellinger , lf-virt , Anthony Liguori , Stefan Hajnoczi , Paolo Bonzini , Asias He Subject: [Qemu-devel] [PATCH 3/3] vhost: Only call vhost_verify_ring_mappings when adding vhost memory X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Sender: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org 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); }