SYS-OSS/FRET-qemu
4
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

xen-platform: exclude vfio-pci from the PCI platform unplug

Browse Source 
Such that PCI passthrough devices work for Xen emulated guests.

Signed-off-by: Joao Martins <joao.m.martins@oracle.com>
Signed-off-by: David Woodhouse <dwmw@amazon.co.uk>
Reviewed-by: Paul Durrant <paul@xen.org>
This commit is contained in:
Joao Martins 2019-01-18 14:29:52 -05:00 committed by David Woodhouse
parent 5e691a955a
commit 3bb1ebac6c
1 changed files with 15 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
hw/i386/xen/xen_platform.c
View File

@ -108,12 +108,25 @@ static void log_writeb(PCIXenPlatformState *s, char val)
#define _UNPLUG_NVME_DISKS 3 #define _UNPLUG_NVME_DISKS 3
#define UNPLUG_NVME_DISKS (1u << _UNPLUG_NVME_DISKS) #define UNPLUG_NVME_DISKS (1u << _UNPLUG_NVME_DISKS)
static bool pci_device_is_passthrough(PCIDevice *d)
{
if (!strcmp(d->name, "xen-pci-passthrough")) {
return true;
}
if (xen_mode == XEN_EMULATE && !strcmp(d->name, "vfio-pci")) {
return true;
}
return false;
}
static void unplug_nic(PCIBus *b, PCIDevice *d, void *o) static void unplug_nic(PCIBus *b, PCIDevice *d, void *o)
{ {
/* We have to ignore passthrough devices */ /* We have to ignore passthrough devices */
if (pci_get_word(d->config + PCI_CLASS_DEVICE) == if (pci_get_word(d->config + PCI_CLASS_DEVICE) ==
PCI_CLASS_NETWORK_ETHERNET PCI_CLASS_NETWORK_ETHERNET
&& strcmp(d->name, "xen-pci-passthrough") != 0) { && !pci_device_is_passthrough(d)) {
object_unparent(OBJECT(d)); object_unparent(OBJECT(d));
} }
} }
@ -186,9 +199,8 @@ static void unplug_disks(PCIBus *b, PCIDevice *d, void *opaque)
!(flags & UNPLUG_IDE_SCSI_DISKS); !(flags & UNPLUG_IDE_SCSI_DISKS);
/* We have to ignore passthrough devices */ /* We have to ignore passthrough devices */
if (!strcmp(d->name, "xen-pci-passthrough")) { if (pci_device_is_passthrough(d))
return; return;
}
switch (pci_get_word(d->config + PCI_CLASS_DEVICE)) { switch (pci_get_word(d->config + PCI_CLASS_DEVICE)) {
case PCI_CLASS_STORAGE_IDE: case PCI_CLASS_STORAGE_IDE: