| Message ID | 20191015162705.28087-29-philmd@redhat.com (mailing list archive) |
|---|---|
| State | Superseded |
| Headers | show |
| Series | hw/i386/pc: Split PIIX3 southbridge from i440FX northbridge | expand |
On Tuesday, October 15, 2019, Philippe Mathieu-Daudé <philmd@redhat.com> wrote: > From: Philippe Mathieu-Daudé <f4bug@amsat.org> > > The hw/pci-host/piix.c contains a mix of PIIX3 and i440FX chipsets > functions. To be able to split it, we need to export some > declarations first. > > Signed-off-by: Philippe Mathieu-Daudé <philmd@redhat.com> > --- > MAINTAINERS | 1 + > hw/acpi/pcihp.c | 2 +- > hw/i386/pc_piix.c | 1 + > hw/pci-host/piix.c | 1 + > include/hw/i386/pc.h | 22 --------------------- > include/hw/pci-host/i440fx.h | 37 ++++++++++++++++++++++++++++++++++++ > stubs/pci-host-piix.c | 3 ++- > 7 files changed, 43 insertions(+), 24 deletions(-) > create mode 100644 include/hw/pci-host/i440fx.h > > Reviewed-by: Aleksandar Markovic <amarkovic@wavecomp.com> > diff --git a/MAINTAINERS b/MAINTAINERS > index 556f58bd8c..adf059a164 100644 > --- a/MAINTAINERS > +++ b/MAINTAINERS > @@ -1228,6 +1228,7 @@ F: hw/i386/ > F: hw/pci-host/piix.c > F: hw/pci-host/q35.c > F: hw/pci-host/pam.c > +F: include/hw/pci-host/i440fx.h > F: include/hw/pci-host/q35.h > F: include/hw/pci-host/pam.h > F: hw/isa/lpc_ich9.c > diff --git a/hw/acpi/pcihp.c b/hw/acpi/pcihp.c > index 82d295b6e8..8413348a33 100644 > --- a/hw/acpi/pcihp.c > +++ b/hw/acpi/pcihp.c > @@ -27,7 +27,7 @@ > #include "qemu/osdep.h" > #include "hw/acpi/pcihp.h" > > -#include "hw/i386/pc.h" > +#include "hw/pci-host/i440fx.h" > #include "hw/pci/pci.h" > #include "hw/pci/pci_bridge.h" > #include "hw/acpi/acpi.h" > diff --git a/hw/i386/pc_piix.c b/hw/i386/pc_piix.c > index 5b35ff04c7..8ac4bf12ca 100644 > --- a/hw/i386/pc_piix.c > +++ b/hw/i386/pc_piix.c > @@ -29,6 +29,7 @@ > #include "hw/loader.h" > #include "hw/i386/pc.h" > #include "hw/i386/apic.h" > +#include "hw/pci-host/i440fx.h" > #include "hw/southbridge/piix.h" > #include "hw/display/ramfb.h" > #include "hw/firmware/smbios.h" > diff --git a/hw/pci-host/piix.c b/hw/pci-host/piix.c > index a450fc726e..0b5da5bc94 100644 > --- a/hw/pci-host/piix.c > +++ b/hw/pci-host/piix.c > @@ -27,6 +27,7 @@ > #include "hw/irq.h" > #include "hw/pci/pci.h" > #include "hw/pci/pci_host.h" > +#include "hw/pci-host/i440fx.h" > #include "hw/southbridge/piix.h" > #include "hw/qdev-properties.h" > #include "hw/isa/isa.h" > diff --git a/include/hw/i386/pc.h b/include/hw/i386/pc.h > index 1c20b96571..cead2828de 100644 > --- a/include/hw/i386/pc.h > +++ b/include/hw/i386/pc.h > @@ -248,28 +248,6 @@ int cmos_get_fd_drive_type(FloppyDriveType fd0); > /* hpet.c */ > extern int no_hpet; > > -/* piix_pci.c */ > -struct PCII440FXState; > -typedef struct PCII440FXState PCII440FXState; > - > -#define TYPE_I440FX_PCI_HOST_BRIDGE "i440FX-pcihost" > -#define TYPE_I440FX_PCI_DEVICE "i440FX" > - > -#define TYPE_IGD_PASSTHROUGH_I440FX_PCI_DEVICE "igd-passthrough-i440FX" > - > -PCIBus *i440fx_init(const char *host_type, const char *pci_type, > - PCII440FXState **pi440fx_state, int *piix_devfn, > - ISABus **isa_bus, qemu_irq *pic, > - MemoryRegion *address_space_mem, > - MemoryRegion *address_space_io, > - ram_addr_t ram_size, > - ram_addr_t below_4g_mem_size, > - ram_addr_t above_4g_mem_size, > - MemoryRegion *pci_memory, > - MemoryRegion *ram_memory); > - > -PCIBus *find_i440fx(void); > - > /* pc_sysfw.c */ > void pc_system_flash_create(PCMachineState *pcms); > void pc_system_firmware_init(PCMachineState *pcms, MemoryRegion > *rom_memory); > diff --git a/include/hw/pci-host/i440fx.h b/include/hw/pci-host/i440fx.h > new file mode 100644 > index 0000000000..e327f9bf87 > --- /dev/null > +++ b/include/hw/pci-host/i440fx.h > @@ -0,0 +1,37 @@ > +/* > + * QEMU i440FX North Bridge Emulation > + * > + * Copyright (c) 2006 Fabrice Bellard > + * > + * This work is licensed under the terms of the GNU GPL, version 2 or > later. > + * See the COPYING file in the top-level directory. > + * > + */ > + > +#ifndef HW_PCI_I440FX_H > +#define HW_PCI_I440FX_H > + > +#include "hw/hw.h" > +#include "hw/pci/pci_bus.h" > + > +typedef struct PCII440FXState PCII440FXState; > + > +#define TYPE_I440FX_PCI_HOST_BRIDGE "i440FX-pcihost" > +#define TYPE_I440FX_PCI_DEVICE "i440FX" > + > +#define TYPE_IGD_PASSTHROUGH_I440FX_PCI_DEVICE "igd-passthrough-i440FX" > + > +PCIBus *i440fx_init(const char *host_type, const char *pci_type, > + PCII440FXState **pi440fx_state, int *piix_devfn, > + ISABus **isa_bus, qemu_irq *pic, > + MemoryRegion *address_space_mem, > + MemoryRegion *address_space_io, > + ram_addr_t ram_size, > + ram_addr_t below_4g_mem_size, > + ram_addr_t above_4g_mem_size, > + MemoryRegion *pci_memory, > + MemoryRegion *ram_memory); > + > +PCIBus *find_i440fx(void); > + > +#endif > diff --git a/stubs/pci-host-piix.c b/stubs/pci-host-piix.c > index 6ed81b1f21..93975adbfe 100644 > --- a/stubs/pci-host-piix.c > +++ b/stubs/pci-host-piix.c > @@ -1,5 +1,6 @@ > #include "qemu/osdep.h" > -#include "hw/i386/pc.h" > +#include "hw/pci-host/i440fx.h" > + > PCIBus *find_i440fx(void) > { > return NULL; > -- > 2.21.0 > > >
diff --git a/MAINTAINERS b/MAINTAINERS index 556f58bd8c..adf059a164 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -1228,6 +1228,7 @@ F: hw/i386/ F: hw/pci-host/piix.c F: hw/pci-host/q35.c F: hw/pci-host/pam.c +F: include/hw/pci-host/i440fx.h F: include/hw/pci-host/q35.h F: include/hw/pci-host/pam.h F: hw/isa/lpc_ich9.c diff --git a/hw/acpi/pcihp.c b/hw/acpi/pcihp.c index 82d295b6e8..8413348a33 100644 --- a/hw/acpi/pcihp.c +++ b/hw/acpi/pcihp.c @@ -27,7 +27,7 @@ #include "qemu/osdep.h" #include "hw/acpi/pcihp.h" -#include "hw/i386/pc.h" +#include "hw/pci-host/i440fx.h" #include "hw/pci/pci.h" #include "hw/pci/pci_bridge.h" #include "hw/acpi/acpi.h" diff --git a/hw/i386/pc_piix.c b/hw/i386/pc_piix.c index 5b35ff04c7..8ac4bf12ca 100644 --- a/hw/i386/pc_piix.c +++ b/hw/i386/pc_piix.c @@ -29,6 +29,7 @@ #include "hw/loader.h" #include "hw/i386/pc.h" #include "hw/i386/apic.h" +#include "hw/pci-host/i440fx.h" #include "hw/southbridge/piix.h" #include "hw/display/ramfb.h" #include "hw/firmware/smbios.h" diff --git a/hw/pci-host/piix.c b/hw/pci-host/piix.c index a450fc726e..0b5da5bc94 100644 --- a/hw/pci-host/piix.c +++ b/hw/pci-host/piix.c @@ -27,6 +27,7 @@ #include "hw/irq.h" #include "hw/pci/pci.h" #include "hw/pci/pci_host.h" +#include "hw/pci-host/i440fx.h" #include "hw/southbridge/piix.h" #include "hw/qdev-properties.h" #include "hw/isa/isa.h" diff --git a/include/hw/i386/pc.h b/include/hw/i386/pc.h index 1c20b96571..cead2828de 100644 --- a/include/hw/i386/pc.h +++ b/include/hw/i386/pc.h @@ -248,28 +248,6 @@ int cmos_get_fd_drive_type(FloppyDriveType fd0); /* hpet.c */ extern int no_hpet; -/* piix_pci.c */ -struct PCII440FXState; -typedef struct PCII440FXState PCII440FXState; - -#define TYPE_I440FX_PCI_HOST_BRIDGE "i440FX-pcihost" -#define TYPE_I440FX_PCI_DEVICE "i440FX" - -#define TYPE_IGD_PASSTHROUGH_I440FX_PCI_DEVICE "igd-passthrough-i440FX" - -PCIBus *i440fx_init(const char *host_type, const char *pci_type, - PCII440FXState **pi440fx_state, int *piix_devfn, - ISABus **isa_bus, qemu_irq *pic, - MemoryRegion *address_space_mem, - MemoryRegion *address_space_io, - ram_addr_t ram_size, - ram_addr_t below_4g_mem_size, - ram_addr_t above_4g_mem_size, - MemoryRegion *pci_memory, - MemoryRegion *ram_memory); - -PCIBus *find_i440fx(void); - /* pc_sysfw.c */ void pc_system_flash_create(PCMachineState *pcms); void pc_system_firmware_init(PCMachineState *pcms, MemoryRegion *rom_memory); diff --git a/include/hw/pci-host/i440fx.h b/include/hw/pci-host/i440fx.h new file mode 100644 index 0000000000..e327f9bf87 --- /dev/null +++ b/include/hw/pci-host/i440fx.h @@ -0,0 +1,37 @@ +/* + * QEMU i440FX North Bridge Emulation + * + * Copyright (c) 2006 Fabrice Bellard + * + * This work is licensed under the terms of the GNU GPL, version 2 or later. + * See the COPYING file in the top-level directory. + * + */ + +#ifndef HW_PCI_I440FX_H +#define HW_PCI_I440FX_H + +#include "hw/hw.h" +#include "hw/pci/pci_bus.h" + +typedef struct PCII440FXState PCII440FXState; + +#define TYPE_I440FX_PCI_HOST_BRIDGE "i440FX-pcihost" +#define TYPE_I440FX_PCI_DEVICE "i440FX" + +#define TYPE_IGD_PASSTHROUGH_I440FX_PCI_DEVICE "igd-passthrough-i440FX" + +PCIBus *i440fx_init(const char *host_type, const char *pci_type, + PCII440FXState **pi440fx_state, int *piix_devfn, + ISABus **isa_bus, qemu_irq *pic, + MemoryRegion *address_space_mem, + MemoryRegion *address_space_io, + ram_addr_t ram_size, + ram_addr_t below_4g_mem_size, + ram_addr_t above_4g_mem_size, + MemoryRegion *pci_memory, + MemoryRegion *ram_memory); + +PCIBus *find_i440fx(void); + +#endif diff --git a/stubs/pci-host-piix.c b/stubs/pci-host-piix.c index 6ed81b1f21..93975adbfe 100644 --- a/stubs/pci-host-piix.c +++ b/stubs/pci-host-piix.c @@ -1,5 +1,6 @@ #include "qemu/osdep.h" -#include "hw/i386/pc.h" +#include "hw/pci-host/i440fx.h" + PCIBus *find_i440fx(void) { return NULL;