MAINTAINERS | 14 +-
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 +-
26 files changed, 699 insertions(+), 683 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
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
Regards,
Phil.
The following changes since commit 9bb73502321d46f4d320fa17aa38201445783fc4:
Merge remote-tracking branch 'remotes/mst/tags/for_upstream' into staging (2019-10-28 13:32:40 +0000)
are available in the Git repository at:
https://gitlab.com/philmd/qemu.git tags/pc_split_i440fx_piix-pull-request
for you to fetch changes up to d1389352cde824ce8dab7c1a2ded150df6add124:
hw/pci-host/i440fx: Remove the last PIIX3 traces (2019-10-28 16:12:29 +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é (15):
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 +-
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 +-
26 files changed, 699 insertions(+), 683 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
Patchew URL: https://patchew.org/QEMU/20191028163447.18541-1-philmd@redhat.com/
Hi,
This series seems to have some coding style problems. See output below for
more information:
Subject: [PULL 00/20] hw/i386/pc: Split PIIX3 southbridge from i440FX northbridge
Type: series
Message-id: 20191028163447.18541-1-philmd@redhat.com
=== TEST SCRIPT BEGIN ===
#!/bin/bash
git rev-parse base > /dev/null || exit 0
git config --local diff.renamelimit 0
git config --local diff.renames True
git config --local diff.algorithm histogram
./scripts/checkpatch.pl --mailback base..
=== TEST SCRIPT END ===
Switched to a new branch 'test'
197f3c2 hw/pci-host/i440fx: Remove the last PIIX3 traces
1578c52 hw/pci-host: Rename incorrectly named 'piix' as 'i440fx'
0cf957a hw/pci-host/piix: Extract PIIX3 functions to hw/isa/piix3.c
2bbf9c2 hw/pci-host/piix: Fix code style issues
304a402 hw/pci-host/piix: Move i440FX declarations to hw/pci-host/i440fx.h
893e79f hw/pci-host/piix: Define and use the PIIX IRQ Route Control Registers
8f3c905 hw/pci-host/piix: Move RCR_IOPORT register definition
799441b hw/pci-host/piix: Extract piix3_create()
741229b hw/i386: Remove obsolete LoadStateHandler::load_state_old handlers
52dfc30 hw/isa/piix4: Move piix4_create() to hw/isa/piix4.c
6478b21 hw/mips/mips_malta: Extract the PIIX4 creation code as piix4_create()
7ce078e hw/mips/mips_malta: Create IDE hard drive array dynamically
a20ffb1 piix4: Add a MC146818 RTC Controller as specified in datasheet
1faf74d piix4: Add an i8254 PIT Controller as specified in datasheet
5fa91a8 piix4: Add an i8257 DMA Controller as specified in datasheet
9f72841 piix4: Rename PIIX4 object to piix4-isa
b35c56d Revert "irq: introduce qemu_irq_proxy()"
e6a0756 piix4: Add an i8259 Interrupt Controller as specified in datasheet
1b38311 piix4: Add the Reset Control Register
b4bc66f MAINTAINERS: Keep PIIX4 South Bridge separate from PC Chipsets
=== OUTPUT BEGIN ===
1/20 Checking commit b4bc66f4da87 (MAINTAINERS: Keep PIIX4 South Bridge separate from PC Chipsets)
2/20 Checking commit 1b38311e3c79 (piix4: Add the Reset Control Register)
3/20 Checking commit e6a0756c9612 (piix4: Add an i8259 Interrupt Controller as specified in datasheet)
4/20 Checking commit b35c56d2afb5 (Revert "irq: introduce qemu_irq_proxy()")
5/20 Checking commit 9f72841bf6ba (piix4: Rename PIIX4 object to piix4-isa)
6/20 Checking commit 5fa91a8d2a28 (piix4: Add an i8257 DMA Controller as specified in datasheet)
7/20 Checking commit 1faf74dbd4fd (piix4: Add an i8254 PIT Controller as specified in datasheet)
8/20 Checking commit a20ffb119d09 (piix4: Add a MC146818 RTC Controller as specified in datasheet)
WARNING: added, moved or deleted file(s), does MAINTAINERS need updating?
#193:
deleted file mode 100644
total: 0 errors, 1 warnings, 166 lines checked
Patch 8/20 has style problems, please review. If any of these errors
are false positives report them to the maintainer, see
CHECKPATCH in MAINTAINERS.
9/20 Checking commit 7ce078e38824 (hw/mips/mips_malta: Create IDE hard drive array dynamically)
10/20 Checking commit 6478b213ff27 (hw/mips/mips_malta: Extract the PIIX4 creation code as piix4_create())
11/20 Checking commit 52dfc30fcdaa (hw/isa/piix4: Move piix4_create() to hw/isa/piix4.c)
12/20 Checking commit 741229b29fcb (hw/i386: Remove obsolete LoadStateHandler::load_state_old handlers)
13/20 Checking commit 799441beda9f (hw/pci-host/piix: Extract piix3_create())
14/20 Checking commit 8f3c905eff45 (hw/pci-host/piix: Move RCR_IOPORT register definition)
15/20 Checking commit 893e79f2ea67 (hw/pci-host/piix: Define and use the PIIX IRQ Route Control Registers)
16/20 Checking commit 304a402b3d92 (hw/pci-host/piix: Move i440FX declarations to hw/pci-host/i440fx.h)
WARNING: added, moved or deleted file(s), does MAINTAINERS need updating?
#98:
new file mode 100644
total: 0 errors, 1 warnings, 101 lines checked
Patch 16/20 has style problems, please review. If any of these errors
are false positives report them to the maintainer, see
CHECKPATCH in MAINTAINERS.
17/20 Checking commit 2bbf9c2bde4b (hw/pci-host/piix: Fix code style issues)
18/20 Checking commit 0cf957a9a55b (hw/pci-host/piix: Extract PIIX3 functions to hw/isa/piix3.c)
WARNING: added, moved or deleted file(s), does MAINTAINERS need updating?
#65:
new file mode 100644
ERROR: spaces required around that '*' (ctx:VxV)
#314: FILE: hw/isa/piix3.c:245:
+ .subsections = (const VMStateDescription*[]) {
^
total: 1 errors, 1 warnings, 937 lines checked
Patch 18/20 has style problems, please review. If any of these errors
are false positives report them to the maintainer, see
CHECKPATCH in MAINTAINERS.
19/20 Checking commit 1578c5216a29 (hw/pci-host: Rename incorrectly named 'piix' as 'i440fx')
WARNING: added, moved or deleted file(s), does MAINTAINERS need updating?
#69:
rename from hw/pci-host/piix.c
total: 0 errors, 1 warnings, 32 lines checked
Patch 19/20 has style problems, please review. If any of these errors
are false positives report them to the maintainer, see
CHECKPATCH in MAINTAINERS.
20/20 Checking commit 197f3c262a3a (hw/pci-host/i440fx: Remove the last PIIX3 traces)
=== OUTPUT END ===
Test command exited with code: 1
The full log is available at
http://patchew.org/logs/20191028163447.18541-1-philmd@redhat.com/testing.checkpatch/?type=message.
---
Email generated automatically by Patchew [https://patchew.org/].
Please send your feedback to patchew-devel@redhat.com
On Mon, 28 Oct 2019 at 17:48, 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 > > Regards, > > Phil. > > The following changes since commit 9bb73502321d46f4d320fa17aa38201445783fc4: > > Merge remote-tracking branch 'remotes/mst/tags/for_upstream' into staging (2019-10-28 13:32:40 +0000) > > are available in the Git repository at: > > https://gitlab.com/philmd/qemu.git tags/pc_split_i440fx_piix-pull-request > > for you to fetch changes up to d1389352cde824ce8dab7c1a2ded150df6add124: > > hw/pci-host/i440fx: Remove the last PIIX3 traces (2019-10-28 16:12:29 +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. > > ---------------------------------------------------------------- I get a link failure on my 'do a make clean and then make' build : LINK i386-softmmu/qemu-system-i386 hw/i386/pc_piix.o: In function `pc_init1': /home/petmay01/linaro/qemu-for-merges/hw/i386/pc_piix.c:197: undefined reference to `i440fx_init' /home/petmay01/linaro/qemu-for-merges/hw/i386/pc_piix.c:206: undefined reference to `piix3_create' collect2: error: ld returned 1 exit status thanks -- PMM
Hi Peter, Paolo,
On 10/30/19 7:15 AM, Peter Maydell wrote:
> On Mon, 28 Oct 2019 at 17:48, Philippe Mathieu-Daudé <philmd@redhat.com> wrote:
>>
>> ----------------------------------------------------------------
>> 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.
>>
>> ----------------------------------------------------------------
>
> I get a link failure on my 'do a make clean and then make' build :
> LINK i386-softmmu/qemu-system-i386
> hw/i386/pc_piix.o: In function `pc_init1':
> /home/petmay01/linaro/qemu-for-merges/hw/i386/pc_piix.c:197: undefined
> reference to `i440fx_init'
> /home/petmay01/linaro/qemu-for-merges/hw/i386/pc_piix.c:206: undefined
> reference to `piix3_create'
> collect2: error: ld returned 1 exit status
This is odd, default-configs/i386-softmmu.mak selects CONFIG_I440FX,
I440FX selects PCI_I440FX, and the Makefile.objs has:
common-obj-$(CONFIG_PCI_I440FX) += i440fx.o
The change is in patch "hw/pci-host: Rename incorrectly named 'piix' as
'i440fx'" which is a simple rename:
-- >8 --
diff --git a/hw/i386/Kconfig b/hw/i386/Kconfig
index d420b35548..5a494342ea 100644
--- a/hw/i386/Kconfig
+++ b/hw/i386/Kconfig
@@ -60,7 +60,7 @@ config I440FX
select PC_PCI
select PC_ACPI
select ACPI_SMBUS
- select PCI_PIIX
+ select PCI_I440FX
select PIIX3
select IDE_PIIX
select DIMM
diff --git a/hw/pci-host/Kconfig b/hw/pci-host/Kconfig
index 397043b289..b0aa8351c4 100644
--- a/hw/pci-host/Kconfig
+++ b/hw/pci-host/Kconfig
@@ -28,7 +28,7 @@ config PCI_SABRE
select PCI
bool
-config PCI_PIIX
+config PCI_I440FX
bool
select PCI
select PAM
diff --git a/hw/pci-host/Makefile.objs b/hw/pci-host/Makefile.objs
index a9cd3e022d..efd752b766 100644
--- a/hw/pci-host/Makefile.objs
+++ b/hw/pci-host/Makefile.objs
@@ -13,7 +13,7 @@ common-obj-$(CONFIG_VERSATILE_PCI) += versatile.o
common-obj-$(CONFIG_PCI_SABRE) += sabre.o
common-obj-$(CONFIG_FULONG) += bonito.o
-common-obj-$(CONFIG_PCI_PIIX) += piix.o
+common-obj-$(CONFIG_PCI_I440FX) += i440fx.o
common-obj-$(CONFIG_PCI_EXPRESS_Q35) += q35.o
common-obj-$(CONFIG_PCI_EXPRESS_GENERIC_BRIDGE) += gpex.o
common-obj-$(CONFIG_PCI_EXPRESS_XILINX) += xilinx-pcie.o
diff --git a/hw/pci-host/piix.c b/hw/pci-host/i440fx.c
similarity index 100%
rename from hw/pci-host/piix.c
rename to hw/pci-host/i440fx.c
---
I could reproduce and hw/pci-host/ doesn't contains neither piix.o nor
i440fx.o.
$ fgrep -ri i440fx i386-softmmu/
i386-softmmu/config-devices.h-timestamp:#define CONFIG_I440FX 1
i386-softmmu/config-devices.mak.old:CONFIG_I440FX=y
Binary file i386-softmmu/hw/i386/pc_piix.o matches
i386-softmmu/hw/i386/pc_piix.d:
/home/phil/source/qemu/include/hw/pci-host/i440fx.h \
i386-softmmu/hw/i386/pc_piix.d:/home/phil/source/qemu/include/hw/pci-host/i440fx.h:
Binary file i386-softmmu/hw/i386/acpi-build.o matches
Binary file i386-softmmu/hw/i386/pc.o matches
i386-softmmu/config-devices.mak:CONFIG_I440FX=y
i386-softmmu/config-devices.h:#define CONFIG_I440FX 1
So CONFIG_I440FX is here, but no CONFIG_PCI_I440FX...
$ fgrep -r PIIX i386-softmmu/
i386-softmmu/config-devices.h-timestamp:#define CONFIG_IDE_PIIX 1
i386-softmmu/config-devices.h-timestamp:#define CONFIG_PCI_PIIX 1
i386-softmmu/config-devices.mak.old:CONFIG_IDE_PIIX=y
i386-softmmu/config-devices.mak.old:CONFIG_PCI_PIIX=y
Binary file i386-softmmu/hw/i386/pc_piix.o matches
Binary file i386-softmmu/hw/i386/acpi-build.o matches
Binary file i386-softmmu/hw/i386/pc.o matches
i386-softmmu/config-devices.mak:CONFIG_IDE_PIIX=y
i386-softmmu/config-devices.mak:CONFIG_PCI_PIIX=y
i386-softmmu/config-devices.h:#define CONFIG_IDE_PIIX 1
i386-softmmu/config-devices.h:#define CONFIG_PCI_PIIX 1
And the old CONFIG_PCI_PIIX is still there :(
Paolo, is some kconfig dependency missing?
Regards,
Phil.
Hi Paolo,
On 10/30/19 10:44 AM, Philippe Mathieu-Daudé wrote:
> Hi Peter, Paolo,
>
> On 10/30/19 7:15 AM, Peter Maydell wrote:
>> On Mon, 28 Oct 2019 at 17:48, Philippe Mathieu-Daudé
>> <philmd@redhat.com> wrote:
>>>
>>> ----------------------------------------------------------------
>>> 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.
>>>
>>> ----------------------------------------------------------------
>>
>> I get a link failure on my 'do a make clean and then make' build :
>> LINK i386-softmmu/qemu-system-i386
>> hw/i386/pc_piix.o: In function `pc_init1':
>> /home/petmay01/linaro/qemu-for-merges/hw/i386/pc_piix.c:197: undefined
>> reference to `i440fx_init'
>> /home/petmay01/linaro/qemu-for-merges/hw/i386/pc_piix.c:206: undefined
>> reference to `piix3_create'
>> collect2: error: ld returned 1 exit status
>
> This is odd, default-configs/i386-softmmu.mak selects CONFIG_I440FX,
> I440FX selects PCI_I440FX, and the Makefile.objs has:
> common-obj-$(CONFIG_PCI_I440FX) += i440fx.o
>
> The change is in patch "hw/pci-host: Rename incorrectly named 'piix' as
> 'i440fx'" which is a simple rename:
>
> -- >8 --
> diff --git a/hw/i386/Kconfig b/hw/i386/Kconfig
> index d420b35548..5a494342ea 100644
> --- a/hw/i386/Kconfig
> +++ b/hw/i386/Kconfig
> @@ -60,7 +60,7 @@ config I440FX
> select PC_PCI
> select PC_ACPI
> select ACPI_SMBUS
> - select PCI_PIIX
> + select PCI_I440FX
> select PIIX3
> select IDE_PIIX
> select DIMM
> diff --git a/hw/pci-host/Kconfig b/hw/pci-host/Kconfig
> index 397043b289..b0aa8351c4 100644
> --- a/hw/pci-host/Kconfig
> +++ b/hw/pci-host/Kconfig
> @@ -28,7 +28,7 @@ config PCI_SABRE
> select PCI
> bool
>
> -config PCI_PIIX
> +config PCI_I440FX
> bool
> select PCI
> select PAM
> diff --git a/hw/pci-host/Makefile.objs b/hw/pci-host/Makefile.objs
> index a9cd3e022d..efd752b766 100644
> --- a/hw/pci-host/Makefile.objs
> +++ b/hw/pci-host/Makefile.objs
> @@ -13,7 +13,7 @@ common-obj-$(CONFIG_VERSATILE_PCI) += versatile.o
>
> common-obj-$(CONFIG_PCI_SABRE) += sabre.o
> common-obj-$(CONFIG_FULONG) += bonito.o
> -common-obj-$(CONFIG_PCI_PIIX) += piix.o
> +common-obj-$(CONFIG_PCI_I440FX) += i440fx.o
> common-obj-$(CONFIG_PCI_EXPRESS_Q35) += q35.o
> common-obj-$(CONFIG_PCI_EXPRESS_GENERIC_BRIDGE) += gpex.o
> common-obj-$(CONFIG_PCI_EXPRESS_XILINX) += xilinx-pcie.o
> diff --git a/hw/pci-host/piix.c b/hw/pci-host/i440fx.c
> similarity index 100%
> rename from hw/pci-host/piix.c
> rename to hw/pci-host/i440fx.c
> ---
>
> I could reproduce and hw/pci-host/ doesn't contains neither piix.o nor
> i440fx.o.
>
> $ fgrep -ri i440fx i386-softmmu/
> i386-softmmu/config-devices.h-timestamp:#define CONFIG_I440FX 1
> i386-softmmu/config-devices.mak.old:CONFIG_I440FX=y
> Binary file i386-softmmu/hw/i386/pc_piix.o matches
> i386-softmmu/hw/i386/pc_piix.d:
> /home/phil/source/qemu/include/hw/pci-host/i440fx.h \
> i386-softmmu/hw/i386/pc_piix.d:/home/phil/source/qemu/include/hw/pci-host/i440fx.h:
>
> Binary file i386-softmmu/hw/i386/acpi-build.o matches
> Binary file i386-softmmu/hw/i386/pc.o matches
> i386-softmmu/config-devices.mak:CONFIG_I440FX=y
> i386-softmmu/config-devices.h:#define CONFIG_I440FX 1
>
> So CONFIG_I440FX is here, but no CONFIG_PCI_I440FX...
>
> $ fgrep -r PIIX i386-softmmu/
> i386-softmmu/config-devices.h-timestamp:#define CONFIG_IDE_PIIX 1
> i386-softmmu/config-devices.h-timestamp:#define CONFIG_PCI_PIIX 1
> i386-softmmu/config-devices.mak.old:CONFIG_IDE_PIIX=y
> i386-softmmu/config-devices.mak.old:CONFIG_PCI_PIIX=y
> Binary file i386-softmmu/hw/i386/pc_piix.o matches
> Binary file i386-softmmu/hw/i386/acpi-build.o matches
> Binary file i386-softmmu/hw/i386/pc.o matches
> i386-softmmu/config-devices.mak:CONFIG_IDE_PIIX=y
> i386-softmmu/config-devices.mak:CONFIG_PCI_PIIX=y
> i386-softmmu/config-devices.h:#define CONFIG_IDE_PIIX 1
> i386-softmmu/config-devices.h:#define CONFIG_PCI_PIIX 1
>
> And the old CONFIG_PCI_PIIX is still there :(
>
> Paolo, is some kconfig dependency missing?
docs/devel/build-system.txt is misleading:
- $TARGET-NAME/config-devices.mak
TARGET-NAME is again the name of a system or userspace emulator. The
config-devices.mak file is automatically generated by make using the
scripts/make_device_config.sh program, feeding it the
default-configs/$TARGET-NAME file as input.
But this script has been removed in e0e312f3525:
build: switch to Kconfig
The make_device_config.sh script is replaced by minikconf, which
is modified to support the same command line as its predecessor.
Anyway, back to my problem. We modified hw/i386/Kconfig and
hw/pci-host/Kconfig. i386-softmmu/config-devices.mak hasn't been rebuilt.
Here is the make rule matching i386-softmmu/config-devices.mak:
$(SUBDIR_DEVICES_MAK): %/config-devices.mak: default-configs/%.mak
$(MINIKCONF_INPUTS) $(BUILD_DIR)/config-host.mak
$(call quiet-command, $(MINIKCONF) $(MINIKCONF_ARGS) > $@.tmp, "GEN",
"$@.tmp")
With:
MINIKCONF_INPUTS = $(SRC_PATH)/Kconfig.host $(SRC_PATH)/hw/Kconfig
So hw/{i386,pci-host}/Kconfig aren't matched and doesn't trigger the
regeneration of i386-softmmu/config-devices.mak.
I'm not sure how to properly fix this.
Also, is the backslash useful at the end of this line in Makefile?
MINIKCONF = $(PYTHON) $(SRC_PATH)/scripts/minikconf.py \
Regards,
Phil.
On 11/2/19 9:28 PM, Philippe Mathieu-Daudé wrote:
> Hi Paolo,
>
> On 10/30/19 10:44 AM, Philippe Mathieu-Daudé wrote:
>> Hi Peter, Paolo,
>>
>> On 10/30/19 7:15 AM, Peter Maydell wrote:
>>> On Mon, 28 Oct 2019 at 17:48, Philippe Mathieu-Daudé
>>> <philmd@redhat.com> wrote:
>>>>
>>>> ----------------------------------------------------------------
>>>> 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.
>>>>
>>>> ----------------------------------------------------------------
>>>
>>> I get a link failure on my 'do a make clean and then make' build :
>>> LINK i386-softmmu/qemu-system-i386
>>> hw/i386/pc_piix.o: In function `pc_init1':
>>> /home/petmay01/linaro/qemu-for-merges/hw/i386/pc_piix.c:197: undefined
>>> reference to `i440fx_init'
>>> /home/petmay01/linaro/qemu-for-merges/hw/i386/pc_piix.c:206: undefined
>>> reference to `piix3_create'
>>> collect2: error: ld returned 1 exit status
>>
>> This is odd, default-configs/i386-softmmu.mak selects CONFIG_I440FX,
>> I440FX selects PCI_I440FX, and the Makefile.objs has:
>> common-obj-$(CONFIG_PCI_I440FX) += i440fx.o
>>
>> The change is in patch "hw/pci-host: Rename incorrectly named 'piix'
>> as 'i440fx'" which is a simple rename:
>>
>> -- >8 --
>> diff --git a/hw/i386/Kconfig b/hw/i386/Kconfig
>> index d420b35548..5a494342ea 100644
>> --- a/hw/i386/Kconfig
>> +++ b/hw/i386/Kconfig
>> @@ -60,7 +60,7 @@ config I440FX
>> select PC_PCI
>> select PC_ACPI
>> select ACPI_SMBUS
>> - select PCI_PIIX
>> + select PCI_I440FX
>> select PIIX3
>> select IDE_PIIX
>> select DIMM
>> diff --git a/hw/pci-host/Kconfig b/hw/pci-host/Kconfig
>> index 397043b289..b0aa8351c4 100644
>> --- a/hw/pci-host/Kconfig
>> +++ b/hw/pci-host/Kconfig
>> @@ -28,7 +28,7 @@ config PCI_SABRE
>> select PCI
>> bool
>>
>> -config PCI_PIIX
>> +config PCI_I440FX
>> bool
>> select PCI
>> select PAM
>> diff --git a/hw/pci-host/Makefile.objs b/hw/pci-host/Makefile.objs
>> index a9cd3e022d..efd752b766 100644
>> --- a/hw/pci-host/Makefile.objs
>> +++ b/hw/pci-host/Makefile.objs
>> @@ -13,7 +13,7 @@ common-obj-$(CONFIG_VERSATILE_PCI) += versatile.o
>>
>> common-obj-$(CONFIG_PCI_SABRE) += sabre.o
>> common-obj-$(CONFIG_FULONG) += bonito.o
>> -common-obj-$(CONFIG_PCI_PIIX) += piix.o
>> +common-obj-$(CONFIG_PCI_I440FX) += i440fx.o
>> common-obj-$(CONFIG_PCI_EXPRESS_Q35) += q35.o
>> common-obj-$(CONFIG_PCI_EXPRESS_GENERIC_BRIDGE) += gpex.o
>> common-obj-$(CONFIG_PCI_EXPRESS_XILINX) += xilinx-pcie.o
>> diff --git a/hw/pci-host/piix.c b/hw/pci-host/i440fx.c
>> similarity index 100%
>> rename from hw/pci-host/piix.c
>> rename to hw/pci-host/i440fx.c
>> ---
>>
>> I could reproduce and hw/pci-host/ doesn't contains neither piix.o nor
>> i440fx.o.
>>
>> $ fgrep -ri i440fx i386-softmmu/
>> i386-softmmu/config-devices.h-timestamp:#define CONFIG_I440FX 1
>> i386-softmmu/config-devices.mak.old:CONFIG_I440FX=y
>> Binary file i386-softmmu/hw/i386/pc_piix.o matches
>> i386-softmmu/hw/i386/pc_piix.d:
>> /home/phil/source/qemu/include/hw/pci-host/i440fx.h \
>> i386-softmmu/hw/i386/pc_piix.d:/home/phil/source/qemu/include/hw/pci-host/i440fx.h:
>>
>> Binary file i386-softmmu/hw/i386/acpi-build.o matches
>> Binary file i386-softmmu/hw/i386/pc.o matches
>> i386-softmmu/config-devices.mak:CONFIG_I440FX=y
>> i386-softmmu/config-devices.h:#define CONFIG_I440FX 1
>>
>> So CONFIG_I440FX is here, but no CONFIG_PCI_I440FX...
>>
>> $ fgrep -r PIIX i386-softmmu/
>> i386-softmmu/config-devices.h-timestamp:#define CONFIG_IDE_PIIX 1
>> i386-softmmu/config-devices.h-timestamp:#define CONFIG_PCI_PIIX 1
>> i386-softmmu/config-devices.mak.old:CONFIG_IDE_PIIX=y
>> i386-softmmu/config-devices.mak.old:CONFIG_PCI_PIIX=y
>> Binary file i386-softmmu/hw/i386/pc_piix.o matches
>> Binary file i386-softmmu/hw/i386/acpi-build.o matches
>> Binary file i386-softmmu/hw/i386/pc.o matches
>> i386-softmmu/config-devices.mak:CONFIG_IDE_PIIX=y
>> i386-softmmu/config-devices.mak:CONFIG_PCI_PIIX=y
>> i386-softmmu/config-devices.h:#define CONFIG_IDE_PIIX 1
>> i386-softmmu/config-devices.h:#define CONFIG_PCI_PIIX 1
>>
>> And the old CONFIG_PCI_PIIX is still there :(
>>
>> Paolo, is some kconfig dependency missing?
>
> docs/devel/build-system.txt is misleading:
>
> - $TARGET-NAME/config-devices.mak
>
> TARGET-NAME is again the name of a system or userspace emulator. The
> config-devices.mak file is automatically generated by make using the
> scripts/make_device_config.sh program, feeding it the
> default-configs/$TARGET-NAME file as input.
>
> But this script has been removed in e0e312f3525:
>
> build: switch to Kconfig
>
> The make_device_config.sh script is replaced by minikconf, which
> is modified to support the same command line as its predecessor.
>
> Anyway, back to my problem. We modified hw/i386/Kconfig and
> hw/pci-host/Kconfig. i386-softmmu/config-devices.mak hasn't been rebuilt.
>
> Here is the make rule matching i386-softmmu/config-devices.mak:
>
> $(SUBDIR_DEVICES_MAK): %/config-devices.mak: default-configs/%.mak
> $(MINIKCONF_INPUTS) $(BUILD_DIR)/config-host.mak
> $(call quiet-command, $(MINIKCONF) $(MINIKCONF_ARGS) > $@.tmp,
> "GEN", "$@.tmp")
>
> With:
>
> MINIKCONF_INPUTS = $(SRC_PATH)/Kconfig.host $(SRC_PATH)/hw/Kconfig
>
> So hw/{i386,pci-host}/Kconfig aren't matched and doesn't trigger the
> regeneration of i386-softmmu/config-devices.mak.
>
> I'm not sure how to properly fix this.
So this fixed it, suboptimal but easy:
-- >8 --
diff --git a/Makefile b/Makefile
index 0e994a275d..18414553f4 100644
--- a/Makefile
+++ b/Makefile
@@ -384,7 +384,10 @@ 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 \
+ $(patsubst %,$(SRC_PATH)/hw/%,$(shell sed -ne \
+ 's/source
\(.*\)/\1/p' \
+ <
$(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
---
> Also, is the backslash useful at the end of this line in Makefile?
>
> MINIKCONF = $(PYTHON) $(SRC_PATH)/scripts/minikconf.py \
>
>
> Regards,
>
> Phil.
Patchew URL: https://patchew.org/QEMU/20191028163447.18541-1-philmd@redhat.com/
Hi,
This series seems to have some coding style problems. See output below for
more information:
Subject: [PULL 00/20] hw/i386/pc: Split PIIX3 southbridge from i440FX northbridge
Type: series
Message-id: 20191028163447.18541-1-philmd@redhat.com
=== TEST SCRIPT BEGIN ===
#!/bin/bash
git rev-parse base > /dev/null || exit 0
git config --local diff.renamelimit 0
git config --local diff.renames True
git config --local diff.algorithm histogram
./scripts/checkpatch.pl --mailback base..
=== TEST SCRIPT END ===
Switched to a new branch 'test'
3d1a8d2 hw/pci-host/i440fx: Remove the last PIIX3 traces
f2d285c hw/pci-host: Rename incorrectly named 'piix' as 'i440fx'
93217a8 hw/pci-host/piix: Extract PIIX3 functions to hw/isa/piix3.c
9b203e2 hw/pci-host/piix: Fix code style issues
708064b hw/pci-host/piix: Move i440FX declarations to hw/pci-host/i440fx.h
c9281a6 hw/pci-host/piix: Define and use the PIIX IRQ Route Control Registers
b2dc328 hw/pci-host/piix: Move RCR_IOPORT register definition
1fbf7c1 hw/pci-host/piix: Extract piix3_create()
9aa0091 hw/i386: Remove obsolete LoadStateHandler::load_state_old handlers
504039e hw/isa/piix4: Move piix4_create() to hw/isa/piix4.c
8b9938e hw/mips/mips_malta: Extract the PIIX4 creation code as piix4_create()
a48fb41 hw/mips/mips_malta: Create IDE hard drive array dynamically
d352c6c piix4: Add a MC146818 RTC Controller as specified in datasheet
92da82e piix4: Add an i8254 PIT Controller as specified in datasheet
975e7c1 piix4: Add an i8257 DMA Controller as specified in datasheet
6709cb0 piix4: Rename PIIX4 object to piix4-isa
94ffa08 Revert "irq: introduce qemu_irq_proxy()"
6571bbc piix4: Add an i8259 Interrupt Controller as specified in datasheet
1ed0a87 piix4: Add the Reset Control Register
44ae66c MAINTAINERS: Keep PIIX4 South Bridge separate from PC Chipsets
=== OUTPUT BEGIN ===
1/20 Checking commit 44ae66cabd2d (MAINTAINERS: Keep PIIX4 South Bridge separate from PC Chipsets)
2/20 Checking commit 1ed0a875993f (piix4: Add the Reset Control Register)
3/20 Checking commit 6571bbcb156c (piix4: Add an i8259 Interrupt Controller as specified in datasheet)
4/20 Checking commit 94ffa08f2346 (Revert "irq: introduce qemu_irq_proxy()")
5/20 Checking commit 6709cb03a51a (piix4: Rename PIIX4 object to piix4-isa)
6/20 Checking commit 975e7c1c1c5b (piix4: Add an i8257 DMA Controller as specified in datasheet)
7/20 Checking commit 92da82e20958 (piix4: Add an i8254 PIT Controller as specified in datasheet)
8/20 Checking commit d352c6ce2bdf (piix4: Add a MC146818 RTC Controller as specified in datasheet)
WARNING: added, moved or deleted file(s), does MAINTAINERS need updating?
#193:
deleted file mode 100644
total: 0 errors, 1 warnings, 166 lines checked
Patch 8/20 has style problems, please review. If any of these errors
are false positives report them to the maintainer, see
CHECKPATCH in MAINTAINERS.
9/20 Checking commit a48fb41f3433 (hw/mips/mips_malta: Create IDE hard drive array dynamically)
10/20 Checking commit 8b9938e570c6 (hw/mips/mips_malta: Extract the PIIX4 creation code as piix4_create())
11/20 Checking commit 504039e27e4d (hw/isa/piix4: Move piix4_create() to hw/isa/piix4.c)
12/20 Checking commit 9aa009158fb7 (hw/i386: Remove obsolete LoadStateHandler::load_state_old handlers)
13/20 Checking commit 1fbf7c155767 (hw/pci-host/piix: Extract piix3_create())
14/20 Checking commit b2dc3282a6bf (hw/pci-host/piix: Move RCR_IOPORT register definition)
15/20 Checking commit c9281a6fea29 (hw/pci-host/piix: Define and use the PIIX IRQ Route Control Registers)
16/20 Checking commit 708064b18db2 (hw/pci-host/piix: Move i440FX declarations to hw/pci-host/i440fx.h)
WARNING: added, moved or deleted file(s), does MAINTAINERS need updating?
#98:
new file mode 100644
total: 0 errors, 1 warnings, 101 lines checked
Patch 16/20 has style problems, please review. If any of these errors
are false positives report them to the maintainer, see
CHECKPATCH in MAINTAINERS.
17/20 Checking commit 9b203e2aa380 (hw/pci-host/piix: Fix code style issues)
18/20 Checking commit 93217a8fd17d (hw/pci-host/piix: Extract PIIX3 functions to hw/isa/piix3.c)
WARNING: added, moved or deleted file(s), does MAINTAINERS need updating?
#65:
new file mode 100644
ERROR: spaces required around that '*' (ctx:VxV)
#314: FILE: hw/isa/piix3.c:245:
+ .subsections = (const VMStateDescription*[]) {
^
total: 1 errors, 1 warnings, 937 lines checked
Patch 18/20 has style problems, please review. If any of these errors
are false positives report them to the maintainer, see
CHECKPATCH in MAINTAINERS.
19/20 Checking commit f2d285ceef10 (hw/pci-host: Rename incorrectly named 'piix' as 'i440fx')
WARNING: added, moved or deleted file(s), does MAINTAINERS need updating?
#69:
rename from hw/pci-host/piix.c
total: 0 errors, 1 warnings, 32 lines checked
Patch 19/20 has style problems, please review. If any of these errors
are false positives report them to the maintainer, see
CHECKPATCH in MAINTAINERS.
20/20 Checking commit 3d1a8d21596f (hw/pci-host/i440fx: Remove the last PIIX3 traces)
=== OUTPUT END ===
Test command exited with code: 1
The full log is available at
http://patchew.org/logs/20191028163447.18541-1-philmd@redhat.com/testing.checkpatch/?type=message.
---
Email generated automatically by Patchew [https://patchew.org/].
Please send your feedback to patchew-devel@redhat.com
Patchew URL: https://patchew.org/QEMU/20191028163447.18541-1-philmd@redhat.com/
Hi,
This series seems to have some coding style problems. See output below for
more information:
Subject: [PULL 00/20] hw/i386/pc: Split PIIX3 southbridge from i440FX northbridge
Type: series
Message-id: 20191028163447.18541-1-philmd@redhat.com
=== TEST SCRIPT BEGIN ===
#!/bin/bash
git rev-parse base > /dev/null || exit 0
git config --local diff.renamelimit 0
git config --local diff.renames True
git config --local diff.algorithm histogram
./scripts/checkpatch.pl --mailback base..
=== TEST SCRIPT END ===
Updating 3c8cf5a9c21ff8782164d1def7f44bd888713384
From https://github.com/patchew-project/qemu
* [new tag] patchew/1572316661-20043-1-git-send-email-jasowang@redhat.com -> patchew/1572316661-20043-1-git-send-email-jasowang@redhat.com
- [tag update] patchew/20191025121930.6855-1-jfreimann@redhat.com -> patchew/20191025121930.6855-1-jfreimann@redhat.com
Switched to a new branch 'test'
46be76b hw/pci-host/i440fx: Remove the last PIIX3 traces
2cf51fb hw/pci-host: Rename incorrectly named 'piix' as 'i440fx'
c0a540f hw/pci-host/piix: Extract PIIX3 functions to hw/isa/piix3.c
4395eed hw/pci-host/piix: Fix code style issues
c354c0c hw/pci-host/piix: Move i440FX declarations to hw/pci-host/i440fx.h
db7ce8b hw/pci-host/piix: Define and use the PIIX IRQ Route Control Registers
da2451a hw/pci-host/piix: Move RCR_IOPORT register definition
efaf219 hw/pci-host/piix: Extract piix3_create()
e12eb18 hw/i386: Remove obsolete LoadStateHandler::load_state_old handlers
aeed9da hw/isa/piix4: Move piix4_create() to hw/isa/piix4.c
0461951 hw/mips/mips_malta: Extract the PIIX4 creation code as piix4_create()
cc00464 hw/mips/mips_malta: Create IDE hard drive array dynamically
4b74e4b piix4: Add a MC146818 RTC Controller as specified in datasheet
985bcb1 piix4: Add an i8254 PIT Controller as specified in datasheet
cea90df piix4: Add an i8257 DMA Controller as specified in datasheet
2ff7d98 piix4: Rename PIIX4 object to piix4-isa
24b48ed Revert "irq: introduce qemu_irq_proxy()"
934a7ce piix4: Add an i8259 Interrupt Controller as specified in datasheet
6704ad5 piix4: Add the Reset Control Register
d0325cb MAINTAINERS: Keep PIIX4 South Bridge separate from PC Chipsets
=== OUTPUT BEGIN ===
1/20 Checking commit d0325cb965ae (MAINTAINERS: Keep PIIX4 South Bridge separate from PC Chipsets)
2/20 Checking commit 6704ad5b0f65 (piix4: Add the Reset Control Register)
3/20 Checking commit 934a7ce1b784 (piix4: Add an i8259 Interrupt Controller as specified in datasheet)
4/20 Checking commit 24b48ed294bf (Revert "irq: introduce qemu_irq_proxy()")
5/20 Checking commit 2ff7d987c8c8 (piix4: Rename PIIX4 object to piix4-isa)
6/20 Checking commit cea90dfe4978 (piix4: Add an i8257 DMA Controller as specified in datasheet)
7/20 Checking commit 985bcb1e5fbd (piix4: Add an i8254 PIT Controller as specified in datasheet)
8/20 Checking commit 4b74e4b098ec (piix4: Add a MC146818 RTC Controller as specified in datasheet)
WARNING: added, moved or deleted file(s), does MAINTAINERS need updating?
#193:
deleted file mode 100644
total: 0 errors, 1 warnings, 166 lines checked
Patch 8/20 has style problems, please review. If any of these errors
are false positives report them to the maintainer, see
CHECKPATCH in MAINTAINERS.
9/20 Checking commit cc004640d241 (hw/mips/mips_malta: Create IDE hard drive array dynamically)
10/20 Checking commit 0461951c8b55 (hw/mips/mips_malta: Extract the PIIX4 creation code as piix4_create())
11/20 Checking commit aeed9daa8921 (hw/isa/piix4: Move piix4_create() to hw/isa/piix4.c)
12/20 Checking commit e12eb18a4875 (hw/i386: Remove obsolete LoadStateHandler::load_state_old handlers)
13/20 Checking commit efaf219959f2 (hw/pci-host/piix: Extract piix3_create())
14/20 Checking commit da2451ae6f96 (hw/pci-host/piix: Move RCR_IOPORT register definition)
15/20 Checking commit db7ce8b72831 (hw/pci-host/piix: Define and use the PIIX IRQ Route Control Registers)
16/20 Checking commit c354c0c68be0 (hw/pci-host/piix: Move i440FX declarations to hw/pci-host/i440fx.h)
WARNING: added, moved or deleted file(s), does MAINTAINERS need updating?
#98:
new file mode 100644
total: 0 errors, 1 warnings, 101 lines checked
Patch 16/20 has style problems, please review. If any of these errors
are false positives report them to the maintainer, see
CHECKPATCH in MAINTAINERS.
17/20 Checking commit 4395eedc0400 (hw/pci-host/piix: Fix code style issues)
18/20 Checking commit c0a540fce82b (hw/pci-host/piix: Extract PIIX3 functions to hw/isa/piix3.c)
WARNING: added, moved or deleted file(s), does MAINTAINERS need updating?
#65:
new file mode 100644
ERROR: spaces required around that '*' (ctx:VxV)
#314: FILE: hw/isa/piix3.c:245:
+ .subsections = (const VMStateDescription*[]) {
^
total: 1 errors, 1 warnings, 937 lines checked
Patch 18/20 has style problems, please review. If any of these errors
are false positives report them to the maintainer, see
CHECKPATCH in MAINTAINERS.
19/20 Checking commit 2cf51fb358e2 (hw/pci-host: Rename incorrectly named 'piix' as 'i440fx')
WARNING: added, moved or deleted file(s), does MAINTAINERS need updating?
#69:
rename from hw/pci-host/piix.c
total: 0 errors, 1 warnings, 32 lines checked
Patch 19/20 has style problems, please review. If any of these errors
are false positives report them to the maintainer, see
CHECKPATCH in MAINTAINERS.
20/20 Checking commit 46be76b017ba (hw/pci-host/i440fx: Remove the last PIIX3 traces)
=== OUTPUT END ===
Test command exited with code: 1
The full log is available at
http://patchew.org/logs/20191028163447.18541-1-philmd@redhat.com/testing.checkpatch/?type=message.
---
Email generated automatically by Patchew [https://patchew.org/].
Please send your feedback to patchew-devel@redhat.com
Patchew URL: https://patchew.org/QEMU/20191028163447.18541-1-philmd@redhat.com/
Hi,
This series seems to have some coding style problems. See output below for
more information:
Subject: [PULL 00/20] hw/i386/pc: Split PIIX3 southbridge from i440FX northbridge
Type: series
Message-id: 20191028163447.18541-1-philmd@redhat.com
=== TEST SCRIPT BEGIN ===
#!/bin/bash
git rev-parse base > /dev/null || exit 0
git config --local diff.renamelimit 0
git config --local diff.renames True
git config --local diff.algorithm histogram
./scripts/checkpatch.pl --mailback base..
=== TEST SCRIPT END ===
Updating 3c8cf5a9c21ff8782164d1def7f44bd888713384
From https://github.com/patchew-project/qemu
9bb7350..aaffb85 master -> master
- [tag update] patchew/20191028073441.6448-1-philmd@redhat.com -> patchew/20191028073441.6448-1-philmd@redhat.com
- [tag update] patchew/20191028161841.1198-1-mreitz@redhat.com -> patchew/20191028161841.1198-1-mreitz@redhat.com
Switched to a new branch 'test'
0010520 hw/pci-host/i440fx: Remove the last PIIX3 traces
43c1b70 hw/pci-host: Rename incorrectly named 'piix' as 'i440fx'
93d3159 hw/pci-host/piix: Extract PIIX3 functions to hw/isa/piix3.c
6566f80 hw/pci-host/piix: Fix code style issues
50cfd9a hw/pci-host/piix: Move i440FX declarations to hw/pci-host/i440fx.h
d13e160 hw/pci-host/piix: Define and use the PIIX IRQ Route Control Registers
5c260ce hw/pci-host/piix: Move RCR_IOPORT register definition
e9b0d15 hw/pci-host/piix: Extract piix3_create()
8ad7223 hw/i386: Remove obsolete LoadStateHandler::load_state_old handlers
7a6c877 hw/isa/piix4: Move piix4_create() to hw/isa/piix4.c
6b61c1f hw/mips/mips_malta: Extract the PIIX4 creation code as piix4_create()
478f46b hw/mips/mips_malta: Create IDE hard drive array dynamically
8d3b7a2 piix4: Add a MC146818 RTC Controller as specified in datasheet
bb1039e piix4: Add an i8254 PIT Controller as specified in datasheet
6412082 piix4: Add an i8257 DMA Controller as specified in datasheet
1afe231 piix4: Rename PIIX4 object to piix4-isa
89d9c4e Revert "irq: introduce qemu_irq_proxy()"
32546cc piix4: Add an i8259 Interrupt Controller as specified in datasheet
efb3d0a piix4: Add the Reset Control Register
d075937 MAINTAINERS: Keep PIIX4 South Bridge separate from PC Chipsets
=== OUTPUT BEGIN ===
1/20 Checking commit d0759378cebd (MAINTAINERS: Keep PIIX4 South Bridge separate from PC Chipsets)
2/20 Checking commit efb3d0a1d195 (piix4: Add the Reset Control Register)
3/20 Checking commit 32546cc8d792 (piix4: Add an i8259 Interrupt Controller as specified in datasheet)
4/20 Checking commit 89d9c4e2ebe3 (Revert "irq: introduce qemu_irq_proxy()")
5/20 Checking commit 1afe231217a5 (piix4: Rename PIIX4 object to piix4-isa)
6/20 Checking commit 6412082c918f (piix4: Add an i8257 DMA Controller as specified in datasheet)
7/20 Checking commit bb1039edbd6f (piix4: Add an i8254 PIT Controller as specified in datasheet)
8/20 Checking commit 8d3b7a2e599b (piix4: Add a MC146818 RTC Controller as specified in datasheet)
WARNING: added, moved or deleted file(s), does MAINTAINERS need updating?
#193:
deleted file mode 100644
total: 0 errors, 1 warnings, 166 lines checked
Patch 8/20 has style problems, please review. If any of these errors
are false positives report them to the maintainer, see
CHECKPATCH in MAINTAINERS.
9/20 Checking commit 478f46bfa485 (hw/mips/mips_malta: Create IDE hard drive array dynamically)
10/20 Checking commit 6b61c1fbacd7 (hw/mips/mips_malta: Extract the PIIX4 creation code as piix4_create())
11/20 Checking commit 7a6c8773f6fd (hw/isa/piix4: Move piix4_create() to hw/isa/piix4.c)
12/20 Checking commit 8ad72237df28 (hw/i386: Remove obsolete LoadStateHandler::load_state_old handlers)
13/20 Checking commit e9b0d15a53b5 (hw/pci-host/piix: Extract piix3_create())
14/20 Checking commit 5c260ce9ab3f (hw/pci-host/piix: Move RCR_IOPORT register definition)
15/20 Checking commit d13e160a59fb (hw/pci-host/piix: Define and use the PIIX IRQ Route Control Registers)
16/20 Checking commit 50cfd9a882f1 (hw/pci-host/piix: Move i440FX declarations to hw/pci-host/i440fx.h)
WARNING: added, moved or deleted file(s), does MAINTAINERS need updating?
#98:
new file mode 100644
total: 0 errors, 1 warnings, 101 lines checked
Patch 16/20 has style problems, please review. If any of these errors
are false positives report them to the maintainer, see
CHECKPATCH in MAINTAINERS.
17/20 Checking commit 6566f806c1de (hw/pci-host/piix: Fix code style issues)
18/20 Checking commit 93d315999f4a (hw/pci-host/piix: Extract PIIX3 functions to hw/isa/piix3.c)
WARNING: added, moved or deleted file(s), does MAINTAINERS need updating?
#65:
new file mode 100644
ERROR: spaces required around that '*' (ctx:VxV)
#314: FILE: hw/isa/piix3.c:245:
+ .subsections = (const VMStateDescription*[]) {
^
total: 1 errors, 1 warnings, 937 lines checked
Patch 18/20 has style problems, please review. If any of these errors
are false positives report them to the maintainer, see
CHECKPATCH in MAINTAINERS.
19/20 Checking commit 43c1b70b4651 (hw/pci-host: Rename incorrectly named 'piix' as 'i440fx')
WARNING: added, moved or deleted file(s), does MAINTAINERS need updating?
#69:
rename from hw/pci-host/piix.c
total: 0 errors, 1 warnings, 32 lines checked
Patch 19/20 has style problems, please review. If any of these errors
are false positives report them to the maintainer, see
CHECKPATCH in MAINTAINERS.
20/20 Checking commit 0010520a5c7a (hw/pci-host/i440fx: Remove the last PIIX3 traces)
=== OUTPUT END ===
Test command exited with code: 1
The full log is available at
http://patchew.org/logs/20191028163447.18541-1-philmd@redhat.com/testing.checkpatch/?type=message.
---
Email generated automatically by Patchew [https://patchew.org/].
Please send your feedback to patchew-devel@redhat.com
On Monday, October 28, 2019, 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
>
> Regards,
>
> Phil.
>
>
Does this pull request apply on the current code base directly, or is
dependant on prior application of other pull requests?
Thanks?
A.
> The following changes since commit 9bb73502321d46f4d320fa17aa3820
> 1445783fc4:
>
> Merge remote-tracking branch 'remotes/mst/tags/for_upstream' into
> staging (2019-10-28 13:32:40 +0000)
>
> are available in the Git repository at:
>
> https://gitlab.com/philmd/qemu.git tags/pc_split_i440fx_piix-
> pull-request
>
> for you to fetch changes up to d1389352cde824ce8dab7c1a2ded150df6add124:
>
> hw/pci-host/i440fx: Remove the last PIIX3 traces (2019-10-28 16:12:29
> +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é (15):
> 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 +-
> 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 +-
> 26 files changed, 699 insertions(+), 683 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
>
>
>
Hi Aleksandar,
On 10/29/19 6:18 AM, Aleksandar Markovic wrote:
>
>
> On Monday, October 28, 2019, Philippe Mathieu-Daudé <philmd@redhat.com
> <mailto: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
> <https://lists.gnu.org/archive/html/qemu-devel/2019-10/msg04959.html>
>
> Regards,
>
> Phil.
>
>
> Does this pull request apply on the current code base directly, or is
> dependant on prior application of other pull requests?
I'm not sure I understand the question, this is a pull request, so it
has been tested on the commit on the last master commit (yesterday),
the cover says commit '9bb7350232'. Is there a problem?
> The following changes since commit
> 9bb73502321d46f4d320fa17aa38201445783fc4:
>
> Merge remote-tracking branch 'remotes/mst/tags/for_upstream' into
> staging (2019-10-28 13:32:40 +0000)
>
> are available in the Git repository at:
>
> https://gitlab.com/philmd/qemu.git
> <https://gitlab.com/philmd/qemu.git>
> tags/pc_split_i440fx_piix-pull-request
>
> for you to fetch changes up to d1389352cde824ce8dab7c1a2ded150df6add124:
>
> hw/pci-host/i440fx: Remove the last PIIX3 traces (2019-10-28
> 16:12:29 +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é (15):
> 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 +-
> 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 +-
> 26 files changed, 699 insertions(+), 683 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
>
>
On Tuesday, October 29, 2019, Philippe Mathieu-Daudé <philmd@redhat.com>
wrote:
> Hi Aleksandar,
>
> On 10/29/19 6:18 AM, Aleksandar Markovic wrote:
>
>>
>>
>> On Monday, October 28, 2019, Philippe Mathieu-Daudé <philmd@redhat.com
>> <mailto: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
>> <https://lists.gnu.org/archive/html/qemu-devel/2019-10/msg04959.html>
>>
>> Regards,
>>
>> Phil.
>>
>>
>> Does this pull request apply on the current code base directly, or is
>> dependant on prior application of other pull requests?
>>
>
> I'm not sure I understand the question, this is a pull request, so it has
> been tested on the commit on the last master commit (yesterday),
> the cover says commit '9bb7350232'. Is there a problem?
My question was crystal clear, I can't believe you couldn't understand it.
There is no problem in that case (if your request applies on the master at
the moment of the submission),, but you for unknown reason mentioned in
another message that you plan to submit your pull request AFTER merging
Paolo's pull request, creating a confusion whether these pull request
depend each on another.
I am happy if this pull request is finally merged.
I supported this series from the outset, and I still support it, and think
it is a truly valuable reorganization of involved QEMU segment, and I
salute its integration. But I did not like the process of integration that
I thought would be a smooth sailing, but because of surrounding
self-imposed circumstances, it became at times very rocky road. I advise
you that, in future, you try to do one thing at the time, and I think you
can achieve far more that way, even if this does not look that way at furst
glance.
Still, you deserve all kudos for the series!
Yours,
Aleksandar
>
> The following changes since commit
>> 9bb73502321d46f4d320fa17aa38201445783fc4:
>>
>> Merge remote-tracking branch 'remotes/mst/tags/for_upstream' into
>> staging (2019-10-28 13:32:40 +0000)
>>
>> are available in the Git repository at:
>>
>> https://gitlab.com/philmd/qemu.git
>> <https://gitlab.com/philmd/qemu.git>
>> tags/pc_split_i440fx_piix-pull-request
>>
>> for you to fetch changes up to d1389352cde824ce8dab7c1a2ded15
>> 0df6add124:
>>
>> hw/pci-host/i440fx: Remove the last PIIX3 traces (2019-10-28
>> 16:12:29 +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é (15):
>> 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 +-
>> 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 +-
>> 26 files changed, 699 insertions(+), 683 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
>>
>>
>>
© 2016 - 2024 Red Hat, Inc.