diff options
| author | Anthony Liguori <aliguori@us.ibm.com> | 2012-10-22 14:48:23 -0500 |
|---|---|---|
| committer | Anthony Liguori <aliguori@us.ibm.com> | 2012-10-22 14:48:23 -0500 |
| commit | 248bbe74930472e7653dd88716188ab0329f4604 (patch) | |
| tree | 71675bb21740df9650581cc26a500e6f625e3e53 | |
| parent | da124e62de2109a312e21d85d6a3419774c58948 (diff) | |
| parent | d9f0e63898d639629bb7eb914786529185334635 (diff) | |
| download | qemu-248bbe74930472e7653dd88716188ab0329f4604.tar.gz qemu-248bbe74930472e7653dd88716188ab0329f4604.tar.bz2 qemu-248bbe74930472e7653dd88716188ab0329f4604.zip | |
Merge remote-tracking branch 'awilliam/tags/vfio-pci-for-qemu-20121017.0' into staging
* awilliam/tags/vfio-pci-for-qemu-20121017.0:
vfio-pci: Mark non-migratable
vfio-pci: Fix debug build
| -rw-r--r-- | hw/vfio_pci.c | 11 |
1 files changed, 8 insertions, 3 deletions
diff --git a/hw/vfio_pci.c b/hw/vfio_pci.c index f5db4a8567..e49de0d41b 100644 --- a/hw/vfio_pci.c +++ b/hw/vfio_pci.c @@ -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) @@ -1917,6 +1916,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) { @@ -1925,6 +1928,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; |