[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PATCH v7 07/51] xen-platform: exclude vfio-pci from the PCI platform un
From: |
David Woodhouse |
Subject: |
[PATCH v7 07/51] xen-platform: exclude vfio-pci from the PCI platform unplug |
Date: |
Mon, 16 Jan 2023 21:57:21 +0000 |
From: Joao Martins <joao.m.martins@oracle.com>
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>
---
hw/i386/xen/xen_platform.c | 18 +++++++++++++++---
1 file changed, 15 insertions(+), 3 deletions(-)
diff --git a/hw/i386/xen/xen_platform.c b/hw/i386/xen/xen_platform.c
index 7db0d94ec2..50174c2269 100644
--- a/hw/i386/xen/xen_platform.c
+++ b/hw/i386/xen/xen_platform.c
@@ -109,12 +109,25 @@ static void log_writeb(PCIXenPlatformState *s, char val)
#define _UNPLUG_NVME_DISKS 3
#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)
{
/* We have to ignore passthrough devices */
if (pci_get_word(d->config + PCI_CLASS_DEVICE) ==
PCI_CLASS_NETWORK_ETHERNET
- && strcmp(d->name, "xen-pci-passthrough") != 0) {
+ && !pci_device_is_passthrough(d)) {
object_unparent(OBJECT(d));
}
}
@@ -187,9 +200,8 @@ static void unplug_disks(PCIBus *b, PCIDevice *d, void
*opaque)
!(flags & UNPLUG_IDE_SCSI_DISKS);
/* We have to ignore passthrough devices */
- if (!strcmp(d->name, "xen-pci-passthrough")) {
+ if (pci_device_is_passthrough(d))
return;
- }
switch (pci_get_word(d->config + PCI_CLASS_DEVICE)) {
case PCI_CLASS_STORAGE_IDE:
--
2.39.0
- [PATCH v7 00/51] Xen support under KVM, David Woodhouse, 2023/01/16
- [PATCH v7 18/51] i386/xen: implement HYPERVISOR_hvm_op, David Woodhouse, 2023/01/16
- [PATCH v7 08/51] xen-platform: allow its creation with XEN_EMULATE mode, David Woodhouse, 2023/01/16
- [PATCH v7 23/51] i386/xen: implement HYPERVISOR_event_channel_op, David Woodhouse, 2023/01/16
- [PATCH v7 31/51] hw/xen: Implement EVTCHNOP_bind_virq, David Woodhouse, 2023/01/16
- [PATCH v7 07/51] xen-platform: exclude vfio-pci from the PCI platform unplug,
David Woodhouse <=
- [PATCH v7 02/51] xen: add CONFIG_XENFV_MACHINE and CONFIG_XEN_EMU options for Xen emulation, David Woodhouse, 2023/01/16
- [PATCH v7 25/51] i386/xen: implement HVMOP_set_param, David Woodhouse, 2023/01/16
- [PATCH v7 40/51] hw/xen: Support HVM_PARAM_CALLBACK_TYPE_PCI_INTX callback, David Woodhouse, 2023/01/16
- [PATCH v7 04/51] i386/kvm: Add xen-version KVM accelerator property and init KVM Xen support, David Woodhouse, 2023/01/16
- [PATCH v7 24/51] i386/xen: implement HVMOP_set_evtchn_upcall_vector, David Woodhouse, 2023/01/16
- [PATCH v7 09/51] i386/xen: handle guest hypercalls, David Woodhouse, 2023/01/16
- [PATCH v7 16/51] i386/xen: implement HYPERVISOR_memory_op, David Woodhouse, 2023/01/16
- [PATCH v7 37/51] hw/xen: Implement EVTCHNOP_reset, David Woodhouse, 2023/01/16
- [PATCH v7 35/51] hw/xen: Implement EVTCHNOP_bind_interdomain, David Woodhouse, 2023/01/16
- [PATCH v7 41/51] kvm/i386: Add xen-gnttab-max-frames property, David Woodhouse, 2023/01/16