vfio-pci fixes

GIT PULL New Alex Williamson 1 participant 3 messages Oct 18, 2012 KVM

lore

Share & tools

lore

Alex Williamson

author

2012-10-18 20:51 UTC #0 lore raw

Anthony,

The following changes since commit 1414968a6aecd23cb037bc9e718d6f05ead2afaf:

tcg: Optimize mulu2 (2012-10-17 17:51:39 +0200)

are available in the git repository at:

git://github.com/awilliam/qemu-vfio.git tags/vfio-pci-for-qemu-20121017.0

for you to fetch changes up to d9f0e63898d639629bb7eb914786529185334635:

vfio-pci: Mark non-migratable (2012-10-17 11:20:14 -0600)

----------------------------------------------------------------
vfio-pci fixes 20121017.0

Just a pair of trivial fixes to get in before I'm offline for a couple weeks. Thanks,

Alex

----------------------------------------------------------------
Alex Williamson (2):
vfio-pci: Fix debug build
vfio-pci: Mark non-migratable

 hw/vfio_pci.c | 11 ++++++++---
 1 file changed, 8 insertions(+), 3 deletions(-)

Alex Williamson

author

2012-10-18 20:51 UTC #1 lore raw

PATCH 1/2 vfio-pci: Fix debug build

Stray variable from before MSI-X rework

Signed-off-by Alex Williamson <[email protected]>

---

 hw/vfio_pci.c |    5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

hw/vfio_pci.c +2 -3

index 639371e..0619af4 100644
@@ -639,9 +639,8 @@ static void vfio_disable_msix(VFIODevice *vdev)
 
     vfio_disable_msi_common(vdev);
 
-    DPRINTF("%s(%04x:%02x:%02x.%x, msi%s)\n", __func__,
-            vdev->host.domain, vdev->host.bus, vdev->host.slot,
-            vdev->host.function, msix ? "x" : "");
+    DPRINTF("%s(%04x:%02x:%02x.%x)\n", __func__, vdev->host.domain,
+            vdev->host.bus, vdev->host.slot, vdev->host.function);
 }
 
 static void vfio_disable_msi(VFIODevice *vdev)

Alex Williamson

author

2012-10-18 20:51 UTC #2 lore raw

PATCH 2/2 vfio-pci: Mark non-migratable

In reply to Alex Williamson

We haven't magically fixed this yet. Toss in a description too.

Signed-off-by Alex Williamson <[email protected]>

---

 hw/vfio_pci.c |    6 ++++++
 1 file changed, 6 insertions(+)

hw/vfio_pci.c +6 -0

index 0619af4..d5ff367 100644
@@ -1946,6 +1946,10 @@ static Property vfio_pci_dev_properties[] = {
     DEFINE_PROP_END_OF_LIST(),
 };
 
+static const VMStateDescription vfio_pci_vmstate = {
+    .name = "vfio-pci",
+    .unmigratable = 1,
+};
 
 static void vfio_pci_dev_class_init(ObjectClass *klass, void *data)
 {

@@ -1954,6 +1958,8 @@ static void vfio_pci_dev_class_init(ObjectClass *klass, void *data)
 
     dc->reset = vfio_pci_reset;
     dc->props = vfio_pci_dev_properties;
+    dc->vmsd = &vfio_pci_vmstate;
+    dc->desc = "VFIO-based PCI device assignment";
     pdc->init = vfio_initfn;
     pdc->exit = vfio_exitfn;
     pdc->config_read = vfio_pci_read_config;