diff options
| author | Michael S. Tsirkin <mst@redhat.com> | 2011-03-19 19:28:19 +0200 |
|---|---|---|
| committer | Aurelien Jarno <aurelien@aurel32.net> | 2011-03-29 08:55:12 +0200 |
| commit | 6f162b368f6af3836c78c01d1dff299fc275367f (patch) | |
| tree | 315bc420cc1f22eeda89fbd304a428f60ecc8cb8 | |
| parent | b25a1bbcda04cc5b14e804f0c135e0e2708d6881 (diff) | |
| download | qemu-6f162b368f6af3836c78c01d1dff299fc275367f.tar.gz | |
virtio-pci: fix bus master work around on load
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 <mst@redhat.com>
Cc: Alexander Graf <agraf@suse.de>
(cherry picked from commit 89c473fd82daf7dddad8162a683bcd0ef671ecda)
| -rw-r--r-- | hw/virtio-pci.c | 13 | ||||
| -rw-r--r-- | hw/virtio.h | 1 |
2 files changed, 7 insertions, 7 deletions
diff --git a/hw/virtio-pci.c b/hw/virtio-pci.c index 3911b09b07..d40ac230ee 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); diff --git a/hw/virtio.h b/hw/virtio.h index 31d16e1c31..d1fb8a0f5c 100644 --- a/hw/virtio.h +++ b/hw/virtio.h @@ -92,6 +92,7 @@ typedef struct { void (*save_queue)(void * opaque, int n, QEMUFile *f); int (*load_config)(void * opaque, QEMUFile *f); int (*load_queue)(void * opaque, int n, QEMUFile *f); + int (*load_done)(void * opaque, QEMUFile *f); unsigned (*get_features)(void * opaque); bool (*query_guest_notifiers)(void * opaque); int (*set_guest_notifiers)(void * opaque, bool assigned); |