david.venhoff/QEMU-Nyx-fork
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'awilliam/tags/vfio-pci-for-qemu-20121017.0' into staging

Browse Source 
* awilliam/tags/vfio-pci-for-qemu-20121017.0:
  vfio-pci: Mark non-migratable
  vfio-pci: Fix debug build
This commit is contained in:
Anthony Liguori 2012-10-22 14:48:23 -05:00
commit 248bbe7493
1 changed files with 8 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
hw/vfio_pci.c
View File

@ -639,9 +639,8 @@ static void vfio_disable_msix(VFIODevice *vdev)
vfio_disable_msi_common(vdev); vfio_disable_msi_common(vdev);
DPRINTF("%s(%04x:%02x:%02x.%x, msi%s)\n", __func__, DPRINTF("%s(%04x:%02x:%02x.%x)\n", __func__, vdev->host.domain,
vdev->host.domain, vdev->host.bus, vdev->host.slot, vdev->host.bus, vdev->host.slot, vdev->host.function);
vdev->host.function, msix ? "x" : "");
} }
static void vfio_disable_msi(VFIODevice *vdev) static void vfio_disable_msi(VFIODevice *vdev)
@ -1917,6 +1916,10 @@ static Property vfio_pci_dev_properties[] = {
DEFINE_PROP_END_OF_LIST(), 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) 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->reset = vfio_pci_reset;
dc->props = vfio_pci_dev_properties; dc->props = vfio_pci_dev_properties;
dc->vmsd = &vfio_pci_vmstate;
dc->desc = "VFIO-based PCI device assignment";
pdc->init = vfio_initfn; pdc->init = vfio_initfn;
pdc->exit = vfio_exitfn; pdc->exit = vfio_exitfn;
pdc->config_read = vfio_pci_read_config; pdc->config_read = vfio_pci_read_config;