[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[RFC PATCH v4 07/47] xen-platform: exclude vfio-pci from the PCI platfor
From: |
David Woodhouse |
Subject: |
[RFC PATCH v4 07/47] xen-platform: exclude vfio-pci from the PCI platform unplug |
Date: |
Wed, 21 Dec 2022 01:05:43 +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 a64265cca0..a6f0fb478a 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.35.3
- [RFC PATCH v4 31/47] hw/xen: Implement EVTCHNOP_unmask, (continued)
- [RFC PATCH v4 31/47] hw/xen: Implement EVTCHNOP_unmask, David Woodhouse, 2022/12/20
- [RFC PATCH v4 27/47] hw/xen: Add xen_evtchn device for event channel emulation, David Woodhouse, 2022/12/20
- [RFC PATCH v4 33/47] hw/xen: Implement EVTCHNOP_bind_ipi, David Woodhouse, 2022/12/20
- [RFC PATCH v4 25/47] i386/xen: implement HVMOP_set_evtchn_upcall_vector, David Woodhouse, 2022/12/20
- [RFC PATCH v4 47/47] i386/xen: handle PV timer hypercalls, David Woodhouse, 2022/12/20
- [RFC PATCH v4 39/47] i386/xen: add monitor commands to test event injection, David Woodhouse, 2022/12/20
- [RFC PATCH v4 30/47] hw/xen: Implement EVTCHNOP_close, David Woodhouse, 2022/12/20
- [RFC PATCH v4 43/47] hw/xen: Add xen_gnttab device for grant table emulation, David Woodhouse, 2022/12/20
- [RFC PATCH v4 06/47] i386/hvm: Set Xen vCPU ID in KVM, David Woodhouse, 2022/12/20
- [RFC PATCH v4 36/47] hw/xen: Implement EVTCHNOP_bind_interdomain, David Woodhouse, 2022/12/20
- [RFC PATCH v4 07/47] xen-platform: exclude vfio-pci from the PCI platform unplug,
David Woodhouse <=
- [RFC PATCH v4 10/47] i386/xen: handle guest hypercalls, David Woodhouse, 2022/12/20
- [RFC PATCH v4 42/47] kvm/i386: Add xen-gnttab-max-frames property, David Woodhouse, 2022/12/20
- [RFC PATCH v4 28/47] i386/xen: Add support for Xen event channel delivery to vCPU, David Woodhouse, 2022/12/20
- [RFC PATCH v4 18/47] i386/xen: implement XENMEM_add_to_physmap_batch, David Woodhouse, 2022/12/20
- [RFC PATCH v4 09/47] hw/xen_backend: refactor xen_be_init(), David Woodhouse, 2022/12/20
- [RFC PATCH v4 04/47] i386/kvm: Add xen-version KVM accelerator property and init KVM Xen support, David Woodhouse, 2022/12/20
- [RFC PATCH v4 23/47] i386/xen: handle VCPUOP_register_runstate_memory_area, David Woodhouse, 2022/12/20
- [RFC PATCH v4 16/47] i386/xen: manage and save/restore Xen guest long_mode setting, David Woodhouse, 2022/12/20
- [RFC PATCH v4 26/47] i386/xen: implement HVMOP_set_param, David Woodhouse, 2022/12/20
- [RFC PATCH v4 17/47] i386/xen: implement HYPERVISOR_memory_op, David Woodhouse, 2022/12/20