diff options
| author | Michael S. Tsirkin | 2014-10-14 18:40:06 +0200 |
|---|---|---|
| committer | Michael S. Tsirkin | 2014-11-02 11:03:03 +0100 |
| commit | 68a27b208a2328653faa09bc7a13d7ef0e2710bb (patch) | |
| tree | d981e7664865fd5cf030129776f853fec84cc5c2 /hw/virtio/virtio-pci.h | |
| parent | pcie: change confused comment clearer (diff) | |
| download | qemu-68a27b208a2328653faa09bc7a13d7ef0e2710bb.tar.gz qemu-68a27b208a2328653faa09bc7a13d7ef0e2710bb.tar.xz qemu-68a27b208a2328653faa09bc7a13d7ef0e2710bb.zip | |
virtio-pci: fix migration for pci bus master
Current support for bus master (clearing OK bit) together with the need to
support guests which do not enable PCI bus mastering, leads to extra state in
VIRTIO_PCI_FLAG_BUS_MASTER_BUG bit, which isn't robust in case of cross-version
migration for the case when guests use the device before setting DRIVER_OK.
Rip out this code, and replace it:
- Modern QEMU doesn't need VIRTIO_PCI_FLAG_BUS_MASTER_BUG
so just drop it for latest machine type.
- For compat machine types, set PCI_COMMAND if DRIVER_OK
is set.
As this is needed for 2.1 for both pc and ppc, move PC_COMPAT macros from pc.h
to a new common header.
Cc: Greg Kurz <gkurz@linux.vnet.ibm.com>
Signed-off-by: Michael S. Tsirkin <mst@redhat.com>
Reviewed-by: Alexander Graf <agraf@suse.de>
Diffstat (limited to 'hw/virtio/virtio-pci.h')
| -rw-r--r-- | hw/virtio/virtio-pci.h | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/hw/virtio/virtio-pci.h b/hw/virtio/virtio-pci.h index 1cea157a47..8873b6d138 100644 --- a/hw/virtio/virtio-pci.h +++ b/hw/virtio/virtio-pci.h @@ -53,6 +53,11 @@ typedef struct VirtioBusClass VirtioPCIBusClass; #define VIRTIO_PCI_BUS_CLASS(klass) \ OBJECT_CLASS_CHECK(VirtioPCIBusClass, klass, TYPE_VIRTIO_PCI_BUS) +/* Need to activate work-arounds for buggy guests at vmstate load. */ +#define VIRTIO_PCI_FLAG_BUS_MASTER_BUG_MIGRATION_BIT 0 +#define VIRTIO_PCI_FLAG_BUS_MASTER_BUG_MIGRATION \ + (1 << VIRTIO_PCI_FLAG_BUS_MASTER_BUG_MIGRATION_BIT) + /* Performance improves when virtqueue kick processing is decoupled from the * vcpu thread using ioeventfd for some devices. */ #define VIRTIO_PCI_FLAG_USE_IOEVENTFD_BIT 1 |