[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH] xen/pt: Fix a xen passthrough failure
From: |
Zhao Yan |
Subject: |
[Qemu-devel] [PATCH] xen/pt: Fix a xen passthrough failure |
Date: |
Sun, 2 Dec 2018 21:37:28 -0500 |
For some pci device, even its PCI_INTERRUPT_PIN is not 0, it actually
doesn't support INTx mode, so its machine irq read from host sysfs is 0.
In that case, report PCI_INTERRUPT_PIN as 0 to guest and let passthrough
continue.
Cc: Roger Pau Monné <address@hidden>
Cc: Jan Beulich <address@hidden>
Signed-off-by: Zhao Yan <address@hidden>
---
hw/xen/xen_pt.c | 5 +++++
hw/xen/xen_pt_config_init.c | 7 ++++++-
2 files changed, 11 insertions(+), 1 deletion(-)
diff --git a/hw/xen/xen_pt.c b/hw/xen/xen_pt.c
index f1f3a3727c..de63cb8e94 100644
--- a/hw/xen/xen_pt.c
+++ b/hw/xen/xen_pt.c
@@ -847,6 +847,11 @@ static void xen_pt_realize(PCIDevice *d, Error **errp)
}
machine_irq = s->real_device.irq;
+ if(machine_irq == 0) {
+ XEN_PT_LOG(d, "machine irq is 0\n");
+ goto out;
+ }
+
rc = xc_physdev_map_pirq(xen_xc, xen_domid, machine_irq, &pirq);
if (rc < 0) {
error_setg_errno(errp, errno, "Mapping machine irq %u to"
diff --git a/hw/xen/xen_pt_config_init.c b/hw/xen/xen_pt_config_init.c
index 47f9010c75..8baddbed90 100644
--- a/hw/xen/xen_pt_config_init.c
+++ b/hw/xen/xen_pt_config_init.c
@@ -300,7 +300,12 @@ static int xen_pt_irqpin_reg_init(XenPCIPassthroughState
*s,
XenPTRegInfo *reg, uint32_t real_offset,
uint32_t *data)
{
- *data = xen_pt_pci_read_intx(s);
+ if (s->real_device.irq)
+ *data = xen_pt_pci_read_intx(s);
+ else {
+ XEN_PT_LOG(&s->dev, "machine irq is 0, init guest PCI_INTERRUPT_PIN to
0\n");
+ *data = 0;
+ }
return 0;
}
--
2.17.1
- [Qemu-devel] [PATCH] xen/pt: Fix a xen passthrough failure,
Zhao Yan <=