[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PULL 02/25] xen/pt: allow passthrough of devices with bogu
From: |
Anthony PERARD |
Subject: |
[Qemu-devel] [PULL 02/25] xen/pt: allow passthrough of devices with bogus interrupt pin |
Date: |
Mon, 14 Jan 2019 13:51:31 +0000 |
From: Zhao Yan <address@hidden>
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.
Reviewed-by: Roger Pau Monné <address@hidden>
Signed-off-by: Zhao Yan <address@hidden>
Acked-by: Anthony PERARD <address@hidden>
Signed-off-by: Anthony PERARD <address@hidden>
---
hw/xen/xen_pt.c | 6 ++++++
hw/xen/xen_pt_config_init.c | 4 +++-
2 files changed, 9 insertions(+), 1 deletion(-)
diff --git a/hw/xen/xen_pt.c b/hw/xen/xen_pt.c
index f1f3a3727c..815dc46ba7 100644
--- a/hw/xen/xen_pt.c
+++ b/hw/xen/xen_pt.c
@@ -847,6 +847,12 @@ 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");
+ cmd |= PCI_COMMAND_INTX_DISABLE;
+ 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..9fd953a689 100644
--- a/hw/xen/xen_pt_config_init.c
+++ b/hw/xen/xen_pt_config_init.c
@@ -300,7 +300,9 @@ 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);
+ }
return 0;
}
--
Anthony PERARD
- [Qemu-devel] [PULL 00/25] Xen queue v2, Anthony PERARD, 2019/01/14
- [Qemu-devel] [PULL 05/25] xen: introduce 'xen-block', 'xen-disk' and 'xen-cdrom', Anthony PERARD, 2019/01/14
- [Qemu-devel] [PULL 09/25] xen: add event channel interface for XenDevice-s, Anthony PERARD, 2019/01/14
- [Qemu-devel] [PULL 06/25] xen: create xenstore areas for XenDevice-s, Anthony PERARD, 2019/01/14
- [Qemu-devel] [PULL 08/25] xen: add grant table interface for XenDevice-s, Anthony PERARD, 2019/01/14
- [Qemu-devel] [PULL 01/25] hw/xen/xen_pt_graphics: Don't trust the BIOS ROM contents so much, Anthony PERARD, 2019/01/14
- [Qemu-devel] [PULL 03/25] xen: re-name XenDevice to XenLegacyDevice..., Anthony PERARD, 2019/01/14
- [Qemu-devel] [PULL 02/25] xen/pt: allow passthrough of devices with bogus interrupt pin,
Anthony PERARD <=
- [Qemu-devel] [PULL 04/25] xen: introduce new 'XenBus' and 'XenDevice' object hierarchy, Anthony PERARD, 2019/01/14
- [Qemu-devel] [PULL 07/25] xen: add xenstore watcher infrastructure, Anthony PERARD, 2019/01/14
- [Qemu-devel] [PULL 22/25] xen: Replace few mentions of xend by libxl, Anthony PERARD, 2019/01/14
- [Qemu-devel] [PULL 19/25] MAINTAINERS: add myself as a Xen maintainer, Anthony PERARD, 2019/01/14
- [Qemu-devel] [PULL 10/25] xen: duplicate xen_disk.c as basis of dataplane/xen-block.c, Anthony PERARD, 2019/01/14
- [Qemu-devel] [PULL 16/25] xen: add implementations of xen-block connect and disconnect functions..., Anthony PERARD, 2019/01/14
- [Qemu-devel] [PULL 12/25] xen: add header and build dataplane/xen-block.c, Anthony PERARD, 2019/01/14
- [Qemu-devel] [PULL 13/25] xen: remove 'XenBlkDev' and 'blkdev' names from dataplane/xen-block, Anthony PERARD, 2019/01/14
- [Qemu-devel] [PULL 17/25] xen: add a mechanism to automatically create XenDevice-s..., Anthony PERARD, 2019/01/14
- [Qemu-devel] [PULL 15/25] xen: purge 'blk' and 'ioreq' from function names in dataplane/xen-block.c, Anthony PERARD, 2019/01/14