* [PULL v2 00/21] hw/i386/pc: Split PIIX3 southbridge from i440FX northbridge
@ 2019-11-05 22:53 Philippe Mathieu-Daudé
2019-11-05 22:53 ` [PULL v2 01/21] Makefile: Fix config-devices.mak not regenerated when Kconfig updated Philippe Mathieu-Daudé
2019-11-06 21:27 ` [PULL v2 00/21] hw/i386/pc: Split PIIX3 southbridge from i440FX northbridge Peter Maydell
0 siblings, 2 replies; 3+ messages in thread
From: Philippe Mathieu-Daudé @ 2019-11-05 22:53 UTC (permalink / raw)
To: qemu-devel
Cc: Paolo Bonzini, Philippe Mathieu-Daudé, Aleksandar Markovic
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
^ permalink raw reply [flat|nested] 3+ messages in thread
* [PULL v2 01/21] Makefile: Fix config-devices.mak not regenerated when Kconfig updated
2019-11-05 22:53 [PULL v2 00/21] hw/i386/pc: Split PIIX3 southbridge from i440FX northbridge Philippe Mathieu-Daudé
@ 2019-11-05 22:53 ` Philippe Mathieu-Daudé
2019-11-06 21:27 ` [PULL v2 00/21] hw/i386/pc: Split PIIX3 southbridge from i440FX northbridge Peter Maydell
1 sibling, 0 replies; 3+ messages in thread
From: Philippe Mathieu-Daudé @ 2019-11-05 22:53 UTC (permalink / raw)
To: qemu-devel
Cc: Laurent Vivier, Peter Maydell, Daniel P . Berrangé,
Aleksandar Markovic, Paolo Bonzini, Philippe Mathieu-Daudé
When hw/$DIR/Kconfig is changed, the corresponding generated
hw/$DIR/config-devices.mak is not being updated.
Fix this by including all the hw/*/Kconfig files to the prerequisite
names of the rule generating the config-devices.mak files.
Fixes: e0e312f3525a (build: switch to Kconfig)
Reported-by: Peter Maydell <peter.maydell@linaro.org>
Suggested-by: Daniel P. Berrangé <berrange@redhat.com>
Reviewed-by: Laurent Vivier <lvivier@redhat.com>
Reviewed-by: Daniel P. Berrangé <berrange@redhat.com>
Signed-off-by: Philippe Mathieu-Daudé <philmd@redhat.com>
---
Makefile | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
diff --git a/Makefile b/Makefile
index bd6376d295..aa9d1a42aa 100644
--- a/Makefile
+++ b/Makefile
@@ -390,7 +390,8 @@ MINIKCONF_ARGS = \
CONFIG_LINUX=$(CONFIG_LINUX) \
CONFIG_PVRDMA=$(CONFIG_PVRDMA)
-MINIKCONF_INPUTS = $(SRC_PATH)/Kconfig.host $(SRC_PATH)/hw/Kconfig
+MINIKCONF_INPUTS = $(SRC_PATH)/Kconfig.host $(SRC_PATH)/hw/Kconfig \
+ $(wildcard $(SRC_PATH)/hw/*/Kconfig)
MINIKCONF = $(PYTHON) $(SRC_PATH)/scripts/minikconf.py \
$(SUBDIR_DEVICES_MAK): %/config-devices.mak: default-configs/%.mak $(MINIKCONF_INPUTS) $(BUILD_DIR)/config-host.mak
--
2.21.0
^ permalink raw reply related [flat|nested] 3+ messages in thread
* Re: [PULL v2 00/21] hw/i386/pc: Split PIIX3 southbridge from i440FX northbridge
2019-11-05 22:53 [PULL v2 00/21] hw/i386/pc: Split PIIX3 southbridge from i440FX northbridge Philippe Mathieu-Daudé
2019-11-05 22:53 ` [PULL v2 01/21] Makefile: Fix config-devices.mak not regenerated when Kconfig updated Philippe Mathieu-Daudé
@ 2019-11-06 21:27 ` Peter Maydell
1 sibling, 0 replies; 3+ messages in thread
From: Peter Maydell @ 2019-11-06 21:27 UTC (permalink / raw)
To: Philippe Mathieu-Daudé
Cc: Paolo Bonzini, QEMU Developers, Aleksandar Markovic
On Tue, 5 Nov 2019 at 22:55, Philippe Mathieu-Daudé <philmd@redhat.com> wrote:
>
> 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.
>
> ----------------------------------------------------------------
Applied, thanks.
Please update the changelog at https://wiki.qemu.org/ChangeLog/4.2
for any user-visible changes.
-- PMM
^ permalink raw reply [flat|nested] 3+ messages in thread
end of thread, other threads:[~2019-11-06 21:28 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2019-11-05 22:53 [PULL v2 00/21] hw/i386/pc: Split PIIX3 southbridge from i440FX northbridge Philippe Mathieu-Daudé
2019-11-05 22:53 ` [PULL v2 01/21] Makefile: Fix config-devices.mak not regenerated when Kconfig updated Philippe Mathieu-Daudé
2019-11-06 21:27 ` [PULL v2 00/21] hw/i386/pc: Split PIIX3 southbridge from i440FX northbridge Peter Maydell
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.