From patchwork Thu Jun 17 15:15:02 2010 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: virtio-pci: fix bus master bug setting on load Date: Thu, 17 Jun 2010 05:15:02 -0000 From: Alex Williamson X-Patchwork-Id: 56057 Message-Id: <20100617151502.9916.3597.stgit@localhost.localdomain> 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 Acked-by: Michael S. Tsirkin Acked-by: Amit Shah Acked-by: Alexander Graf Acked-by: Juan Quintela --- 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; }