From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from [140.186.70.92] (port=56483 helo=eggs.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1OPHXW-0000CY-Gv for qemu-devel@nongnu.org; Thu, 17 Jun 2010 12:02:04 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.69) (envelope-from ) id 1OPHXR-0007GZ-V8 for qemu-devel@nongnu.org; Thu, 17 Jun 2010 12:02:01 -0400 Received: from cantor2.suse.de ([195.135.220.15]:60766 helo=mx2.suse.de) by eggs.gnu.org with esmtp (Exim 4.69) (envelope-from ) id 1OPHXR-0007G3-Pz for qemu-devel@nongnu.org; Thu, 17 Jun 2010 12:01:57 -0400 Message-ID: <4C1A46F1.7090107@suse.de> Date: Thu, 17 Jun 2010 18:01:53 +0200 From: Alexander Graf MIME-Version: 1.0 References: <20100617151502.9916.3597.stgit@localhost.localdomain> In-Reply-To: <20100617151502.9916.3597.stgit@localhost.localdomain> Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 7bit Subject: [Qemu-devel] Re: [PATCH] virtio-pci: fix bus master bug setting on load List-Id: qemu-devel.nongnu.org List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: Alex Williamson Cc: amit.shah@redhat.com, qemu-devel@nongnu.org, mst@redhat.com Alex Williamson wrote: > The comment suggests we're checking for the driver in the ready > state and bus master disabled, but the code is checking that it's > not in the ready state. > > Signed-off-by: Alex Williamson > Found-by: Amit Shah > --- > > hw/virtio-pci.c | 2 +- > 1 files changed, 1 insertions(+), 1 deletions(-) > > diff --git a/hw/virtio-pci.c b/hw/virtio-pci.c > index e101fa0..7a86a81 100644 > --- a/hw/virtio-pci.c > +++ b/hw/virtio-pci.c > @@ -155,7 +155,7 @@ static int virtio_pci_load_config(void * opaque, QEMUFile *f) > > /* Try to find out if the guest has bus master disabled, but is > in ready state. Then we have a buggy guest OS. */ > - if (!(proxy->vdev->status & VIRTIO_CONFIG_S_DRIVER_OK) && > + if ((proxy->vdev->status & VIRTIO_CONFIG_S_DRIVER_OK) && > Phew - that's an evil one. Thanks for the catch! Acked-by: Alexander Graf Alex