From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from [140.186.70.92] (port=55092 helo=eggs.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1Q14fA-0006co-Om for qemu-devel@nongnu.org; Sat, 19 Mar 2011 18:30:25 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1Q14f8-0000Xm-Nl for qemu-devel@nongnu.org; Sat, 19 Mar 2011 18:30:24 -0400 Received: from mx1.redhat.com ([209.132.183.28]:46383) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Q14f8-0000Xh-8d for qemu-devel@nongnu.org; Sat, 19 Mar 2011 18:30:22 -0400 Date: Sun, 20 Mar 2011 00:30:05 +0200 From: "Michael S. Tsirkin" Message-ID: <20110319223004.GA6323@redhat.com> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline Subject: [Qemu-devel] [PATCH master, stable] virtio-pci: fix bus master work around on load List-Id: qemu-devel.nongnu.org List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: agraf@suse.de, qemu-devel@nongnu.org, jforbes@redhat.com, Alex Williamson , Jes.Sorensen@redhat.com Commit c81131db15dd1844d0db1d51f3cd7a105cfd2cf3 detects old guests by comparing virtio and PCI status. It attempts to do this on load, as well, but load_config callback in a binding is invoked too early and so the virtio status isn't set yet. We could add yet another callback to the binding, to invoke after load, but it seems easier to reuse the existing vmstate callback. Signed-off-by: Michael S. Tsirkin Cc: Alexander Graf --- hw/virtio-pci.c | 13 ++++++------- hw/virtio.h | 1 + 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/hw/virtio-pci.c b/hw/virtio-pci.c index 3911b09..d40ac23 100644 --- a/hw/virtio-pci.c +++ b/hw/virtio-pci.c @@ -160,13 +160,6 @@ static int virtio_pci_load_config(void * opaque, QEMUFile *f) if (proxy->vdev->config_vector != VIRTIO_NO_VECTOR) { return msix_vector_use(&proxy->pci_dev, proxy->vdev->config_vector); } - - /* 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) && - !(proxy->pci_dev.config[PCI_COMMAND] & PCI_COMMAND_MASTER)) { - proxy->flags |= VIRTIO_PCI_FLAG_BUS_MASTER_BUG; - } return 0; } @@ -651,6 +644,12 @@ static void virtio_pci_vmstate_change(void *opaque, bool running) VirtIOPCIProxy *proxy = opaque; if (running) { + /* 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) && + !(proxy->pci_dev.config[PCI_COMMAND] & PCI_COMMAND_MASTER)) { + proxy->flags |= VIRTIO_PCI_FLAG_BUS_MASTER_BUG; + } virtio_pci_start_ioeventfd(proxy); } else { virtio_pci_stop_ioeventfd(proxy); -- 1.7.3.2.91.g446ac