diff options
| author | Anthony Liguori <aliguori@us.ibm.com> | 2012-06-26 15:05:33 -0500 |
|---|---|---|
| committer | Anthony Liguori <aliguori@us.ibm.com> | 2012-06-26 15:05:33 -0500 |
| commit | 7a542b67b32742ff5fe286f819df891d1df7bf56 (patch) | |
| tree | cc85c3d9c0c381ae32178616c5956879cd554cb4 /hw/xen_platform.c | |
| parent | b1a6609e754330c657a057a96322e574c129bc29 (diff) | |
| parent | 3854ca577dad92c4fe97b4a6ebce360e25407af7 (diff) | |
| download | focaccia-qemu-7a542b67b32742ff5fe286f819df891d1df7bf56.tar.gz focaccia-qemu-7a542b67b32742ff5fe286f819df891d1df7bf56.zip | |
Merge remote-tracking branch 'sstabellini/xen-pt' into staging
* sstabellini/xen-pt: Introduce Xen PCI Passthrough, MSI Introduce apic-msidef.h Introduce Xen PCI Passthrough, PCI config space helpers Introduce Xen PCI Passthrough, qdevice qdev-properties: Introduce pci-host-devaddr. pci.c: Add opaque argument to pci_for_each_device. Introduce XenHostPCIDevice to access a pci device on the host. configure: Introduce --enable-xen-pci-passthrough. pci_ids: Add INTEL_82599_SFP_VF id.
Diffstat (limited to 'hw/xen_platform.c')
| -rw-r--r-- | hw/xen_platform.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/hw/xen_platform.c b/hw/xen_platform.c index 0214f370b2..c1fe984f07 100644 --- a/hw/xen_platform.c +++ b/hw/xen_platform.c @@ -83,7 +83,7 @@ static void log_writeb(PCIXenPlatformState *s, char val) #define UNPLUG_ALL_NICS 2 #define UNPLUG_AUX_IDE_DISKS 4 -static void unplug_nic(PCIBus *b, PCIDevice *d) +static void unplug_nic(PCIBus *b, PCIDevice *d, void *o) { if (pci_get_word(d->config + PCI_CLASS_DEVICE) == PCI_CLASS_NETWORK_ETHERNET) { @@ -96,10 +96,10 @@ static void unplug_nic(PCIBus *b, PCIDevice *d) static void pci_unplug_nics(PCIBus *bus) { - pci_for_each_device(bus, 0, unplug_nic); + pci_for_each_device(bus, 0, unplug_nic, NULL); } -static void unplug_disks(PCIBus *b, PCIDevice *d) +static void unplug_disks(PCIBus *b, PCIDevice *d, void *o) { if (pci_get_word(d->config + PCI_CLASS_DEVICE) == PCI_CLASS_STORAGE_IDE) { @@ -109,7 +109,7 @@ static void unplug_disks(PCIBus *b, PCIDevice *d) static void pci_unplug_disks(PCIBus *bus) { - pci_for_each_device(bus, 0, unplug_disks); + pci_for_each_device(bus, 0, unplug_disks, NULL); } static void platform_fixed_ioport_writew(void *opaque, uint32_t addr, uint32_t val) |