From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from [140.186.70.92] (port=55391 helo=eggs.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1OPGo7-0002Io-EY for qemu-devel@nongnu.org; Thu, 17 Jun 2010 11:15:08 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.69) (envelope-from ) id 1OPGo6-0007Gn-0s for qemu-devel@nongnu.org; Thu, 17 Jun 2010 11:15:07 -0400 Received: from mx1.redhat.com ([209.132.183.28]:29910) by eggs.gnu.org with esmtp (Exim 4.69) (envelope-from ) id 1OPGo5-0007Ge-QY for qemu-devel@nongnu.org; Thu, 17 Jun 2010 11:15:05 -0400 From: Alex Williamson Date: Thu, 17 Jun 2010 09:15:02 -0600 Message-ID: <20100617151502.9916.3597.stgit@localhost.localdomain> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: 7bit Subject: [Qemu-devel] [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: qemu-devel@nongnu.org, agraf@suse.de Cc: amit.shah@redhat.com, alex.williamson@redhat.com, mst@redhat.com 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) && !(proxy->pci_dev.config[PCI_COMMAND] & PCI_COMMAND_MASTER)) { proxy->bugs |= VIRTIO_PCI_BUG_BUS_MASTER; }