Hi Peter, This is a X86/MIPS pull, Paolo and Aleksandar are OK I send it:
https://lists.gnu.org/archive/html/qemu-devel/2019-10/msg04959.html Since v1: Fixed the Kconfig bug you reported here: https://lists.gnu.org/archive/html/qemu-devel/2019-11/msg00125.html This is not a new feature, and the series was already posted before soft freeze. Regards, Phil. The following changes since commit 412fbef3d076c43e56451bacb28c4544858c66a3: Merge remote-tracking branch 'remotes/philmd-gitlab/tags/fw_cfg-next-pull-request' into staging (2019-11-05 20:17:11 +0000) are available in the Git repository at: https://gitlab.com/philmd/qemu.git tags/mips-next-20191105 for you to fetch changes up to 48bc99a09cb160a3a2612c4bd5a8a225ed7bf6fb: hw/pci-host/i440fx: Remove the last PIIX3 traces (2019-11-05 23:33:12 +0100) ---------------------------------------------------------------- The i440FX northbridge is only used by the PC machine, while the PIIX southbridge is also used by the Malta MIPS machine. Split the PIIX3 southbridge from i440FX northbridge. ---------------------------------------------------------------- Hervé Poussineau (5): piix4: Add the Reset Control Register piix4: Add an i8259 Interrupt Controller as specified in datasheet piix4: Rename PIIX4 object to piix4-isa piix4: Add an i8257 DMA Controller as specified in datasheet piix4: Add an i8254 PIT Controller as specified in datasheet Philippe Mathieu-Daudé (16): Makefile: Fix config-devices.mak not regenerated when Kconfig updated MAINTAINERS: Keep PIIX4 South Bridge separate from PC Chipsets Revert "irq: introduce qemu_irq_proxy()" piix4: Add a MC146818 RTC Controller as specified in datasheet hw/mips/mips_malta: Create IDE hard drive array dynamically hw/mips/mips_malta: Extract the PIIX4 creation code as piix4_create() hw/isa/piix4: Move piix4_create() to hw/isa/piix4.c hw/i386: Remove obsolete LoadStateHandler::load_state_old handlers hw/pci-host/piix: Extract piix3_create() hw/pci-host/piix: Move RCR_IOPORT register definition hw/pci-host/piix: Define and use the PIIX IRQ Route Control Registers hw/pci-host/piix: Move i440FX declarations to hw/pci-host/i440fx.h hw/pci-host/piix: Fix code style issues hw/pci-host/piix: Extract PIIX3 functions to hw/isa/piix3.c hw/pci-host: Rename incorrectly named 'piix' as 'i440fx' hw/pci-host/i440fx: Remove the last PIIX3 traces MAINTAINERS | 14 +- Makefile | 3 +- hw/acpi/pcihp.c | 2 +- hw/acpi/piix4.c | 42 +-- hw/core/irq.c | 14 - hw/i386/Kconfig | 3 +- hw/i386/acpi-build.c | 5 +- hw/i386/pc_piix.c | 10 +- hw/i386/xen/xen-hvm.c | 5 +- hw/intc/apic_common.c | 49 ---- hw/isa/Kconfig | 4 + hw/isa/Makefile.objs | 1 + hw/isa/piix3.c | 399 +++++++++++++++++++++++++++++ hw/isa/piix4.c | 151 ++++++++++- hw/mips/gt64xxx_pci.c | 5 +- hw/mips/mips_malta.c | 46 +--- hw/pci-host/Kconfig | 3 +- hw/pci-host/Makefile.objs | 2 +- hw/pci-host/{piix.c => i440fx.c} | 424 +------------------------------ hw/timer/i8254_common.c | 40 --- include/hw/acpi/piix4.h | 6 - include/hw/i386/pc.h | 37 --- include/hw/irq.h | 5 - include/hw/isa/isa.h | 2 + include/hw/pci-host/i440fx.h | 36 +++ include/hw/southbridge/piix.h | 74 ++++++ stubs/pci-host-piix.c | 3 +- 27 files changed, 701 insertions(+), 684 deletions(-) create mode 100644 hw/isa/piix3.c rename hw/pci-host/{piix.c => i440fx.c} (58%) delete mode 100644 include/hw/acpi/piix4.h create mode 100644 include/hw/pci-host/i440fx.h create mode 100644 include/hw/southbridge/piix.h -- 2.21.0
