From: Bernhard Beschow <shentey@gmail.com>
To: qemu-devel@nongnu.org
Cc: "Paul Durrant" <paul@xen.org>,
"Marcel Apfelbaum" <marcel.apfelbaum@gmail.com>,
"Michael S. Tsirkin" <mst@redhat.com>,
"Stefano Stabellini" <sstabellini@kernel.org>,
"Anthony Perard" <anthony.perard@citrix.com>,
"Aurelien Jarno" <aurelien@aurel32.net>,
"Philippe Mathieu-Daudé" <philmd@linaro.org>,
"Eduardo Habkost" <eduardo@habkost.net>,
xen-devel@lists.xenproject.org,
"Hervé Poussineau" <hpoussin@reactos.org>,
"Paolo Bonzini" <pbonzini@redhat.com>,
"Richard Henderson" <richard.henderson@linaro.org>,
"Bernhard Beschow" <shentey@gmail.com>
Subject: [PATCH 1/6] include/hw/xen/xen: Make xen_piix3_set_irq() generic and rename it
Date: Mon, 2 Jan 2023 22:34:59 +0100 [thread overview]
Message-ID: <20230102213504.14646-2-shentey@gmail.com> (raw)
In-Reply-To: <20230102213504.14646-1-shentey@gmail.com>
xen_piix3_set_irq() hardcoded the number of PCI IRQ lines. Get it from
the PCI bus instead.
Signed-off-by: Bernhard Beschow <shentey@gmail.com>
---
hw/i386/xen/xen-hvm.c | 9 ++++++---
hw/isa/piix.c | 2 +-
include/hw/xen/xen.h | 2 +-
stubs/xen-hw-stub.c | 2 +-
4 files changed, 9 insertions(+), 6 deletions(-)
diff --git a/hw/i386/xen/xen-hvm.c b/hw/i386/xen/xen-hvm.c
index e4293d6d66..59e8246a48 100644
--- a/hw/i386/xen/xen-hvm.c
+++ b/hw/i386/xen/xen-hvm.c
@@ -142,10 +142,13 @@ int xen_pci_slot_get_pirq(PCIDevice *pci_dev, int irq_num)
return irq_num + (PCI_SLOT(pci_dev->devfn) << 2);
}
-void xen_piix3_set_irq(void *opaque, int irq_num, int level)
+void xen_intx_set_irq(void *opaque, int irq_num, int level)
{
- xen_set_pci_intx_level(xen_domid, 0, 0, irq_num >> 2,
- irq_num & 3, level);
+ PCIDevice *pci_dev = opaque;
+ PCIBus *pci_bus = pci_get_bus(pci_dev);
+
+ xen_set_pci_intx_level(xen_domid, 0, 0, irq_num / pci_bus->nirq,
+ irq_num % pci_bus->nirq, level);
}
int xen_set_pci_link_route(uint8_t link, uint8_t irq)
diff --git a/hw/isa/piix.c b/hw/isa/piix.c
index ae8a27c53c..dc6014a4e4 100644
--- a/hw/isa/piix.c
+++ b/hw/isa/piix.c
@@ -504,7 +504,7 @@ static void piix3_xen_realize(PCIDevice *dev, Error **errp)
* connected to the IOAPIC directly.
* These additional routes can be discovered through ACPI.
*/
- pci_bus_irqs(pci_bus, xen_piix3_set_irq, piix3, XEN_PIIX_NUM_PIRQS);
+ pci_bus_irqs(pci_bus, xen_intx_set_irq, piix3, XEN_PIIX_NUM_PIRQS);
}
static void piix3_xen_class_init(ObjectClass *klass, void *data)
diff --git a/include/hw/xen/xen.h b/include/hw/xen/xen.h
index afdf9c436a..7c83ecf6b9 100644
--- a/include/hw/xen/xen.h
+++ b/include/hw/xen/xen.h
@@ -22,7 +22,7 @@ extern bool xen_domid_restrict;
int xen_pci_slot_get_pirq(PCIDevice *pci_dev, int irq_num);
int xen_set_pci_link_route(uint8_t link, uint8_t irq);
-void xen_piix3_set_irq(void *opaque, int irq_num, int level);
+void xen_intx_set_irq(void *opaque, int irq_num, int level);
void xen_hvm_inject_msi(uint64_t addr, uint32_t data);
int xen_is_pirq_msi(uint32_t msi_data);
diff --git a/stubs/xen-hw-stub.c b/stubs/xen-hw-stub.c
index 34a22f2ad7..7d7ffe83a9 100644
--- a/stubs/xen-hw-stub.c
+++ b/stubs/xen-hw-stub.c
@@ -15,7 +15,7 @@ int xen_pci_slot_get_pirq(PCIDevice *pci_dev, int irq_num)
return -1;
}
-void xen_piix3_set_irq(void *opaque, int irq_num, int level)
+void xen_intx_set_irq(void *opaque, int irq_num, int level)
{
}
--
2.39.0
next prev parent reply other threads:[~2023-01-02 21:37 UTC|newest]
Thread overview: 18+ messages / expand[flat|nested] mbox.gz Atom feed top
2023-01-02 21:34 [PATCH 0/6] Resolve TYPE_PIIX3_XEN_DEVICE Bernhard Beschow
2023-01-02 21:34 ` Bernhard Beschow [this message]
2023-01-02 21:35 ` [PATCH 2/6] hw/isa/piix: Reuse piix3_realize() in piix3_xen_realize() Bernhard Beschow
2023-01-02 21:35 ` [PATCH 3/6] hw/isa/piix: Wire up Xen PCI IRQ handling outside of PIIX3 Bernhard Beschow
2023-01-02 21:35 ` [PATCH 4/6] hw/isa/piix: Avoid Xen-specific variant of piix_write_config() Bernhard Beschow
2023-01-02 21:35 ` [PATCH 5/6] hw/isa/piix: Resolve redundant k->config_write assignments Bernhard Beschow
2023-01-03 13:20 ` Philippe Mathieu-Daudé
2023-01-02 21:35 ` [PATCH 6/6] hw/isa/piix: Resolve redundant TYPE_PIIX3_XEN_DEVICE Bernhard Beschow
2023-01-03 3:15 ` [PATCH 0/6] Resolve TYPE_PIIX3_XEN_DEVICE Chuck Zmudzinski
2023-01-03 13:17 ` Philippe Mathieu-Daudé
2023-01-03 13:38 ` Bernhard Beschow
2023-01-03 17:25 ` Chuck Zmudzinski
2023-01-03 23:12 ` Bernhard Beschow
2023-01-04 8:18 ` Chuck Zmudzinski
2023-01-04 12:13 ` Bernhard Beschow
2023-01-04 13:11 ` Chuck Zmudzinski
2023-01-04 16:12 ` Bernhard Beschow
2023-01-04 16:49 ` Chuck Zmudzinski
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20230102213504.14646-2-shentey@gmail.com \
--to=shentey@gmail.com \
--cc=anthony.perard@citrix.com \
--cc=aurelien@aurel32.net \
--cc=eduardo@habkost.net \
--cc=hpoussin@reactos.org \
--cc=marcel.apfelbaum@gmail.com \
--cc=mst@redhat.com \
--cc=paul@xen.org \
--cc=pbonzini@redhat.com \
--cc=philmd@linaro.org \
--cc=qemu-devel@nongnu.org \
--cc=richard.henderson@linaro.org \
--cc=sstabellini@kernel.org \
--cc=xen-devel@lists.xenproject.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.