On Sun, Jun 26, 2022 at 11:46:56AM +0200, Bernhard Beschow wrote:
> 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 <shen...@gmail.com>
Fine by me
Acked-by: Michael S. Tsirkin <m...@redhat.com>
> ---
> 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 204fda7949..e4293d6d66 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 6388558f92..48f9ab1096 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 13bffaef53..afdf9c436a 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 743967623f..34a22f2ad7 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
