[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PULL 11/11] hw/i386/xen/xen-hvm: Inline xen_piix_pci_write_config_clien
From: |
Laurent Vivier |
Subject: |
[PULL 11/11] hw/i386/xen/xen-hvm: Inline xen_piix_pci_write_config_client() and remove it |
Date: |
Wed, 29 Jun 2022 11:08:49 +0200 |
From: Bernhard Beschow <shentey@gmail.com>
xen_piix_pci_write_config_client() is implemented in the xen sub tree and
uses PIIX constants internally, thus creating a direct dependency on
PIIX. Now that xen_set_pci_link_route() is stubbable, the logic of
xen_piix_pci_write_config_client() can be moved to PIIX which resolves
the dependency.
Signed-off-by: Bernhard Beschow <shentey@gmail.com>
Acked-by: Michael S. Tsirkin <mst@redhat.com>
Reviewed-by: Paul Durrant <paul@xen.org>
Message-Id: <20220626094656.15673-3-shentey@gmail.com>
Signed-off-by: Laurent Vivier <laurent@vivier.eu>
---
hw/i386/xen/xen-hvm.c | 18 ------------------
hw/isa/piix3.c | 15 ++++++++++++++-
include/hw/xen/xen.h | 1 -
stubs/xen-hw-stub.c | 4 ----
4 files changed, 14 insertions(+), 24 deletions(-)
diff --git a/hw/i386/xen/xen-hvm.c b/hw/i386/xen/xen-hvm.c
index 204fda7949d9..e4293d6d666a 100644
--- a/hw/i386/xen/xen-hvm.c
+++ b/hw/i386/xen/xen-hvm.c
@@ -15,7 +15,6 @@
#include "hw/pci/pci.h"
#include "hw/pci/pci_host.h"
#include "hw/i386/pc.h"
-#include "hw/southbridge/piix.h"
#include "hw/irq.h"
#include "hw/hw.h"
#include "hw/i386/apic-msidef.h"
@@ -149,23 +148,6 @@ void xen_piix3_set_irq(void *opaque, int irq_num, int
level)
irq_num & 3, level);
}
-void xen_piix_pci_write_config_client(uint32_t address, uint32_t val, int len)
-{
- int i;
-
- /* Scan for updates to PCI link routes (0x60-0x63). */
- for (i = 0; i < len; i++) {
- uint8_t v = (val >> (8 * i)) & 0xff;
- if (v & 0x80) {
- v = 0;
- }
- v &= 0xf;
- if (((address + i) >= PIIX_PIRQCA) && ((address + i) <= PIIX_PIRQCD)) {
- xen_set_pci_link_route(address + i - PIIX_PIRQCA, v);
- }
- }
-}
-
int xen_set_pci_link_route(uint8_t link, uint8_t irq)
{
return xendevicemodel_set_pci_link_route(xen_dmod, xen_domid, link, irq);
diff --git a/hw/isa/piix3.c b/hw/isa/piix3.c
index 6388558f92d4..48f9ab109645 100644
--- a/hw/isa/piix3.c
+++ b/hw/isa/piix3.c
@@ -138,7 +138,20 @@ static void piix3_write_config(PCIDevice *dev,
static void piix3_write_config_xen(PCIDevice *dev,
uint32_t address, uint32_t val, int len)
{
- xen_piix_pci_write_config_client(address, val, len);
+ int i;
+
+ /* Scan for updates to PCI link routes (0x60-0x63). */
+ for (i = 0; i < len; i++) {
+ uint8_t v = (val >> (8 * i)) & 0xff;
+ if (v & 0x80) {
+ v = 0;
+ }
+ v &= 0xf;
+ if (((address + i) >= PIIX_PIRQCA) && ((address + i) <= PIIX_PIRQCD)) {
+ xen_set_pci_link_route(address + i - PIIX_PIRQCA, v);
+ }
+ }
+
piix3_write_config(dev, address, val, len);
}
diff --git a/include/hw/xen/xen.h b/include/hw/xen/xen.h
index 13bffaef531f..afdf9c436afc 100644
--- a/include/hw/xen/xen.h
+++ b/include/hw/xen/xen.h
@@ -23,7 +23,6 @@ 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_piix_pci_write_config_client(uint32_t address, uint32_t val, int len);
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 743967623f00..34a22f2ad72e 100644
--- a/stubs/xen-hw-stub.c
+++ b/stubs/xen-hw-stub.c
@@ -19,10 +19,6 @@ void xen_piix3_set_irq(void *opaque, int irq_num, int level)
{
}
-void xen_piix_pci_write_config_client(uint32_t address, uint32_t val, int len)
-{
-}
-
int xen_set_pci_link_route(uint8_t link, uint8_t irq)
{
return -1;
--
2.36.1
- [PULL 00/11] Trivial branch for 7.1 patches, Laurent Vivier, 2022/06/29
- [PULL 07/11] hw/pci-host/i440fx: Remove unused parameter from i440fx_init(), Laurent Vivier, 2022/06/29
- [PULL 06/11] MAINTAINERS: Add softmmu/runstate.c to "Main loop", Laurent Vivier, 2022/06/29
- [PULL 03/11] util: Return void on iova_tree_remove, Laurent Vivier, 2022/06/29
- [PULL 01/11] vga: avoid crash if no default vga card, Laurent Vivier, 2022/06/29
- [PULL 11/11] hw/i386/xen/xen-hvm: Inline xen_piix_pci_write_config_client() and remove it,
Laurent Vivier <=
- [PULL 04/11] Trivial: 3 char repeat typos, Laurent Vivier, 2022/06/29
- [PULL 09/11] hw/ide/atapi.c: Correct typos (CD-CDROM -> CD-ROM), Laurent Vivier, 2022/06/29
- [PULL 02/11] qom/object: Remove circular include dependency, Laurent Vivier, 2022/06/29
- [PULL 05/11] trivial typos: namesapce, Laurent Vivier, 2022/06/29
- [PULL 10/11] hw/i386/xen/xen-hvm: Allow for stubbing xen_set_pci_link_route(), Laurent Vivier, 2022/06/29
- [PULL 08/11] common-user: Only compile the common user code if have_user is set, Laurent Vivier, 2022/06/29
- Re: [PULL 00/11] Trivial branch for 7.1 patches, Richard Henderson, 2022/06/29