[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PATCH v12 07/60] xen-platform: exclude vfio-pci from the PCI platform u
From: |
David Woodhouse |
Subject: |
[PATCH v12 07/60] xen-platform: exclude vfio-pci from the PCI platform unplug |
Date: |
Mon, 20 Feb 2023 20:46: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 66e6de31a6..d601a5509d 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 v12 00/60] Xen HVM support under KVM, David Woodhouse, 2023/02/20
- [PATCH v12 41/60] hw/xen: Support HVM_PARAM_CALLBACK_TYPE_PCI_INTX callback, David Woodhouse, 2023/02/20
- [PATCH v12 39/60] i386/xen: add monitor commands to test event injection, David Woodhouse, 2023/02/20
- [PATCH v12 07/60] xen-platform: exclude vfio-pci from the PCI platform unplug,
David Woodhouse <=
- [PATCH v12 22/60] i386/xen: handle VCPUOP_register_vcpu_time_info, David Woodhouse, 2023/02/20
- [PATCH v12 05/60] i386/kvm: handle Xen HVM cpuid leaves, David Woodhouse, 2023/02/20
- [PATCH v12 37/60] hw/xen: Implement EVTCHNOP_bind_vcpu, David Woodhouse, 2023/02/20
- [PATCH v12 10/60] i386/xen: implement HYPERVISOR_xen_version, David Woodhouse, 2023/02/20
- [PATCH v12 60/60] hw/xen: Subsume xen_be_register_common() into xen_be_init(), David Woodhouse, 2023/02/20
- [PATCH v12 42/60] kvm/i386: Add xen-gnttab-max-frames property, David Woodhouse, 2023/02/20
- [PATCH v12 08/60] xen-platform: allow its creation with XEN_EMULATE mode, David Woodhouse, 2023/02/20
- [PATCH v12 35/60] hw/xen: Implement EVTCHNOP_alloc_unbound, David Woodhouse, 2023/02/20
- [PATCH v12 38/60] hw/xen: Implement EVTCHNOP_reset, David Woodhouse, 2023/02/20