qemu-commits
[Top][All Lists]
Advanced
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

[Qemu-commits] [qemu/qemu] b6011c: Makefile: Fix config-devices.mak not

From: Peter Maydell
Subject: [Qemu-commits] [qemu/qemu] b6011c: Makefile: Fix config-devices.mak not regenerated w...
Date: Wed, 06 Nov 2019 13:27:14 -0800 
  Branch: refs/heads/master
  Home:   https://github.com/qemu/qemu
  Commit: b6011caff1223a162648167e3c4ef7c66716c3ba
      
https://github.com/qemu/qemu/commit/b6011caff1223a162648167e3c4ef7c66716c3ba
  Author: Philippe Mathieu-Daudé <address@hidden>
  Date:   2019-11-05 (Tue, 05 Nov 2019)

  Changed paths:
    M Makefile

  Log Message:
  -----------
  Makefile: Fix config-devices.mak not regenerated when Kconfig updated

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 <address@hidden>
Suggested-by: Daniel P. Berrangé <address@hidden>
Reviewed-by: Laurent Vivier <address@hidden>
Reviewed-by: Daniel P. Berrangé <address@hidden>
Signed-off-by: Philippe Mathieu-Daudé <address@hidden>


  Commit: 10386385bce2eb61153a7d2bffd50f38dd4270b8
      
https://github.com/qemu/qemu/commit/10386385bce2eb61153a7d2bffd50f38dd4270b8
  Author: Philippe Mathieu-Daudé <address@hidden>
  Date:   2019-11-05 (Tue, 05 Nov 2019)

  Changed paths:
    M MAINTAINERS

  Log Message:
  -----------
  MAINTAINERS: Keep PIIX4 South Bridge separate from PC Chipsets

The PIIX4 Southbridge is not used by the PC machine,
but by the Malta board (MIPS). Add a new section to
keep it covered.

Suggested-by: Michael S. Tsirkin <address@hidden>
Reviewed-by: Aleksandar Markovic <address@hidden>
Reviewed-by: Li Qiang <address@hidden>
Signed-off-by: Philippe Mathieu-Daudé <address@hidden>


  Commit: 5790b757cfbe0ccdd16e0d6bfd783d1849ca02c1
      
https://github.com/qemu/qemu/commit/5790b757cfbe0ccdd16e0d6bfd783d1849ca02c1
  Author: Hervé Poussineau <address@hidden>
  Date:   2019-11-05 (Tue, 05 Nov 2019)

  Changed paths:
    M hw/isa/piix4.c

  Log Message:
  -----------
  piix4: Add the Reset Control Register

The RCR I/O port (0xcf9) is used to generate a hard reset or a soft reset.

Acked-by: Michael S. Tsirkin <address@hidden>
Acked-by: Paolo Bonzini <address@hidden>
Signed-off-by: Hervé Poussineau <address@hidden>
Message-Id: <address@hidden>
Reviewed-by: Aleksandar Markovic <address@hidden>
Reviewed-by: Li Qiang <address@hidden>
[PMD: rebased, updated includes]
Signed-off-by: Philippe Mathieu-Daudé <address@hidden>


  Commit: 078778c5a55648d1323d1dad5248cc1ef51d04d1
      
https://github.com/qemu/qemu/commit/078778c5a55648d1323d1dad5248cc1ef51d04d1
  Author: Hervé Poussineau <address@hidden>
  Date:   2019-11-05 (Tue, 05 Nov 2019)

  Changed paths:
    M hw/isa/piix4.c
    M hw/mips/mips_malta.c
    M include/hw/i386/pc.h

  Log Message:
  -----------
  piix4: Add an i8259 Interrupt Controller as specified in datasheet

Add ISA irqs as piix4 gpio in, and CPU interrupt request as piix4 gpio out.
Remove i8259 instanciated in malta board, to not have it twice.

We can also remove the now unused piix4_init() function.

Acked-by: Michael S. Tsirkin <address@hidden>
Acked-by: Paolo Bonzini <address@hidden>
Signed-off-by: Hervé Poussineau <address@hidden>
Message-Id: <address@hidden>
Reviewed-by: Aleksandar Markovic <address@hidden>
[PMD: rebased, updated includes, use ISA_NUM_IRQS in for loop]
Signed-off-by: Philippe Mathieu-Daudé <address@hidden>


  Commit: fc531e7cab1ce598a9b994155b8adb805084cb0f
      
https://github.com/qemu/qemu/commit/fc531e7cab1ce598a9b994155b8adb805084cb0f
  Author: Philippe Mathieu-Daudé <address@hidden>
  Date:   2019-11-05 (Tue, 05 Nov 2019)

  Changed paths:
    M hw/core/irq.c
    M include/hw/irq.h

  Log Message:
  -----------
  Revert "irq: introduce qemu_irq_proxy()"

This function isn't used anymore.

This reverts commit 22ec3283efba9ba0792790da786d6776d83f2a92.

Reviewed-by: Thomas Huth <address@hidden>
Reviewed-by: Li Qiang <address@hidden>
Reviewed-by: Esteban Bosse <address@hidden>
Signed-off-by: Philippe Mathieu-Daudé <address@hidden>


  Commit: 9b74b190d6ca36ff997d6c502ec574610e4a251c
      
https://github.com/qemu/qemu/commit/9b74b190d6ca36ff997d6c502ec574610e4a251c
  Author: Hervé Poussineau <address@hidden>
  Date:   2019-11-05 (Tue, 05 Nov 2019)

  Changed paths:
    M hw/isa/piix4.c
    M hw/mips/mips_malta.c
    M include/hw/isa/isa.h

  Log Message:
  -----------
  piix4: Rename PIIX4 object to piix4-isa

Other piix4 parts are already named piix4-ide and piix4-usb-uhci.

Reviewed-by: Philippe Mathieu-Daudé <address@hidden>
Acked-by: Michael S. Tsirkin <address@hidden>
Acked-by: Paolo Bonzini <address@hidden>
Signed-off-by: Hervé Poussineau <address@hidden>
Message-Id: <address@hidden>
Reviewed-by: Aleksandar Markovic <address@hidden>
Reviewed-by: Li Qiang <address@hidden>
Reviewed-by: Esteban Bosse <address@hidden>
[PMD: rebased]
Signed-off-by: Philippe Mathieu-Daudé <address@hidden>


  Commit: 135bfcc1ef47809d550a014c1c59a8cc544922bb
      
https://github.com/qemu/qemu/commit/135bfcc1ef47809d550a014c1c59a8cc544922bb
  Author: Hervé Poussineau <address@hidden>
  Date:   2019-11-05 (Tue, 05 Nov 2019)

  Changed paths:
    M hw/isa/piix4.c
    M hw/mips/mips_malta.c

  Log Message:
  -----------
  piix4: Add an i8257 DMA Controller as specified in datasheet

The i8257 is not a chipset on the Malta board, but is part of
the PIIX4 chipset.
Create the i8257 in the PIIX4 code, remove the one instantiated
in malta board, to not have it twice.

Acked-by: Michael S. Tsirkin <address@hidden>
Acked-by: Paolo Bonzini <address@hidden>
Signed-off-by: Hervé Poussineau <address@hidden>
Message-Id: <address@hidden>
Reviewed-by: Aleksandar Markovic <address@hidden>
Reviewed-by: Esteban Bosse <address@hidden>
[PMD: rebased, reworded description]
Signed-off-by: Philippe Mathieu-Daudé <address@hidden>


  Commit: f9b3cd563dcc32f7afdfc18dab781576bc7d06c1
      
https://github.com/qemu/qemu/commit/f9b3cd563dcc32f7afdfc18dab781576bc7d06c1
  Author: Hervé Poussineau <address@hidden>
  Date:   2019-11-05 (Tue, 05 Nov 2019)

  Changed paths:
    M hw/isa/piix4.c
    M hw/mips/mips_malta.c

  Log Message:
  -----------
  piix4: Add an i8254 PIT Controller as specified in datasheet

Remove i8254 instanciated in malta board, to not have it twice.

Acked-by: Michael S. Tsirkin <address@hidden>
Acked-by: Paolo Bonzini <address@hidden>
Signed-off-by: Hervé Poussineau <address@hidden>
Message-Id: <address@hidden>
Reviewed-by: Aleksandar Markovic <address@hidden>
Signed-off-by: Philippe Mathieu-Daudé <address@hidden>


  Commit: fff123b8fd03433b89b0e8448a6809d4fec1f721
      
https://github.com/qemu/qemu/commit/fff123b8fd03433b89b0e8448a6809d4fec1f721
  Author: Philippe Mathieu-Daudé <address@hidden>
  Date:   2019-11-05 (Tue, 05 Nov 2019)

  Changed paths:
    M MAINTAINERS
    M hw/acpi/piix4.c
    M hw/i386/acpi-build.c
    M hw/i386/pc_piix.c
    M hw/isa/piix4.c
    M hw/mips/mips_malta.c
    R include/hw/acpi/piix4.h
    M include/hw/i386/pc.h
    A include/hw/southbridge/piix.h

  Log Message:
  -----------
  piix4: Add a MC146818 RTC Controller as specified in datasheet

Remove mc146818rtc instanciated in malta board, to not have it twice.

Acked-by: Michael S. Tsirkin <address@hidden>
Acked-by: Paolo Bonzini <address@hidden>
Signed-off-by: Hervé Poussineau <address@hidden>
Message-Id: <address@hidden>
[PMD: rebased, set RTC base_year to 2000]
Reviewed-by: Aleksandar Markovic <address@hidden>
Signed-off-by: Philippe Mathieu-Daudé <address@hidden>


  Commit: fff21c129d0c6a78e9e2e52e4974c4d3904aedce
      
https://github.com/qemu/qemu/commit/fff21c129d0c6a78e9e2e52e4974c4d3904aedce
  Author: Philippe Mathieu-Daudé <address@hidden>
  Date:   2019-11-05 (Tue, 05 Nov 2019)

  Changed paths:
    M hw/mips/mips_malta.c

  Log Message:
  -----------
  hw/mips/mips_malta: Create IDE hard drive array dynamically

In the next commit we'll refactor the PIIX4 code out of
mips_malta_init(). As a preliminary step, add the 'ide_drives'
variable and create the drive array dynamically.

Reviewed-by: Aleksandar Markovic <address@hidden>
Reviewed-by: Li Qiang <address@hidden>
Signed-off-by: Philippe Mathieu-Daudé <address@hidden>


  Commit: c74d2c047e5806e3afb2a02a6ce3f364b5f7ce67
      
https://github.com/qemu/qemu/commit/c74d2c047e5806e3afb2a02a6ce3f364b5f7ce67
  Author: Philippe Mathieu-Daudé <address@hidden>
  Date:   2019-11-05 (Tue, 05 Nov 2019)

  Changed paths:
    M hw/mips/mips_malta.c

  Log Message:
  -----------
  hw/mips/mips_malta: Extract the PIIX4 creation code as piix4_create()

The Malta board instantiate a PIIX4 chipset doing various
calls. Refactor all those related calls into a single
function: piix4_create().

Reviewed-by: Aleksandar Markovic <address@hidden>
Signed-off-by: Philippe Mathieu-Daudé <address@hidden>


  Commit: e29f237996762e3534b36d28d7f8cd844492facb
      
https://github.com/qemu/qemu/commit/e29f237996762e3534b36d28d7f8cd844492facb
  Author: Philippe Mathieu-Daudé <address@hidden>
  Date:   2019-11-05 (Tue, 05 Nov 2019)

  Changed paths:
    M hw/isa/piix4.c
    M hw/mips/gt64xxx_pci.c
    M hw/mips/mips_malta.c
    M include/hw/i386/pc.h
    M include/hw/southbridge/piix.h

  Log Message:
  -----------
  hw/isa/piix4: Move piix4_create() to hw/isa/piix4.c

Now that we properly refactored the piix4_create() function, let's
move it to hw/isa/piix4.c where it belongs, so it can be reused
on other places.

Reviewed-by: Aleksandar Markovic <address@hidden>
Signed-off-by: Philippe Mathieu-Daudé <address@hidden>


  Commit: 8ce60a75181bfb55d65d66a85e9264cf8d18d3d4
      
https://github.com/qemu/qemu/commit/8ce60a75181bfb55d65d66a85e9264cf8d18d3d4
  Author: Philippe Mathieu-Daudé <address@hidden>
  Date:   2019-11-05 (Tue, 05 Nov 2019)

  Changed paths:
    M hw/acpi/piix4.c
    M hw/intc/apic_common.c
    M hw/pci-host/piix.c
    M hw/timer/i8254_common.c

  Log Message:
  -----------
  hw/i386: Remove obsolete LoadStateHandler::load_state_old handlers

These devices implemented their load_state_old() handler 10 years
ago, previous to QEMU v0.12.
Since commit cc425b5ddf removed the pc-0.10 and pc-0.11 machines,
we can drop this code.

Note: the mips_r4k machine started to use the i8254 device just
after QEMU v0.5.0, but the MIPS machine types are not versioned,
so there is no migration compatibility issue removing this handler.

Suggested-by: Peter Maydell <address@hidden>
Reviewed-by: Aleksandar Markovic <address@hidden>
Signed-off-by: Philippe Mathieu-Daudé <address@hidden>


  Commit: b7d255e103b87217297bb0bc0759966a30e553ae
      
https://github.com/qemu/qemu/commit/b7d255e103b87217297bb0bc0759966a30e553ae
  Author: Philippe Mathieu-Daudé <address@hidden>
  Date:   2019-11-05 (Tue, 05 Nov 2019)

  Changed paths:
    M hw/pci-host/piix.c

  Log Message:
  -----------
  hw/pci-host/piix: Extract piix3_create()

Extract the PIIX3 creation code from the i440fx_init() function.

Reviewed-by: Aleksandar Markovic <address@hidden>
Reviewed-by: Esteban Bosse <address@hidden>
Signed-off-by: Philippe Mathieu-Daudé <address@hidden>


  Commit: 0063454affb3c5a595539a3cad9e20e7229d8fac
      
https://github.com/qemu/qemu/commit/0063454affb3c5a595539a3cad9e20e7229d8fac
  Author: Philippe Mathieu-Daudé <address@hidden>
  Date:   2019-11-05 (Tue, 05 Nov 2019)

  Changed paths:
    M hw/i386/acpi-build.c
    M hw/isa/piix4.c
    M hw/pci-host/piix.c
    M include/hw/i386/pc.h
    M include/hw/southbridge/piix.h

  Log Message:
  -----------
  hw/pci-host/piix: Move RCR_IOPORT register definition

The RCR_IOPORT register belongs to the PIIX chipset.
Move the definition to "piix.h", and prepend the PIIX prefix.

Reviewed-by: Aleksandar Markovic <address@hidden>
Signed-off-by: Philippe Mathieu-Daudé <address@hidden>


  Commit: 4b19de14b145ac1df3082f625e3b8f9dcb0e1918
      
https://github.com/qemu/qemu/commit/4b19de14b145ac1df3082f625e3b8f9dcb0e1918
  Author: Philippe Mathieu-Daudé <address@hidden>
  Date:   2019-11-05 (Tue, 05 Nov 2019)

  Changed paths:
    M hw/i386/xen/xen-hvm.c
    M hw/mips/gt64xxx_pci.c
    M hw/pci-host/piix.c
    M include/hw/southbridge/piix.h

  Log Message:
  -----------
  hw/pci-host/piix: Define and use the PIIX IRQ Route Control Registers

The IRQ Route Control registers definitions belong to the PIIX
chipset. We were only defining the 'A' register. Define the other
B, C and D registers, and use them.

Acked-by: Paul Durrant <address@hidden>
Reviewed-by: Aleksandar Markovic <address@hidden>
Signed-off-by: Philippe Mathieu-Daudé <address@hidden>


  Commit: 0fd61a2d1cef4d324128330b8dab7aa1e393f0c9
      
https://github.com/qemu/qemu/commit/0fd61a2d1cef4d324128330b8dab7aa1e393f0c9
  Author: Philippe Mathieu-Daudé <address@hidden>
  Date:   2019-11-05 (Tue, 05 Nov 2019)

  Changed paths:
    M MAINTAINERS
    M hw/acpi/pcihp.c
    M hw/i386/pc_piix.c
    M hw/pci-host/piix.c
    M include/hw/i386/pc.h
    A include/hw/pci-host/i440fx.h
    M stubs/pci-host-piix.c

  Log Message:
  -----------
  hw/pci-host/piix: Move i440FX declarations to hw/pci-host/i440fx.h

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.

Reviewed-by: Aleksandar Markovic <address@hidden>
Signed-off-by: Philippe Mathieu-Daudé <address@hidden>


  Commit: 553b4559dcce67890b5beebc9fb51650d55fdfde
      
https://github.com/qemu/qemu/commit/553b4559dcce67890b5beebc9fb51650d55fdfde
  Author: Philippe Mathieu-Daudé <address@hidden>
  Date:   2019-11-05 (Tue, 05 Nov 2019)

  Changed paths:
    M hw/pci-host/piix.c

  Log Message:
  -----------
  hw/pci-host/piix: Fix code style issues

We will move this code, fix its style first.

Reviewed-by: Aleksandar Markovic <address@hidden>
Reviewed-by: Esteban Bosse <address@hidden>
Signed-off-by: Philippe Mathieu-Daudé <address@hidden>


  Commit: 14a026dd581a16b566c55aea4ee7f1b3758f214a
      
https://github.com/qemu/qemu/commit/14a026dd581a16b566c55aea4ee7f1b3758f214a
  Author: Philippe Mathieu-Daudé <address@hidden>
  Date:   2019-11-05 (Tue, 05 Nov 2019)

  Changed paths:
    M MAINTAINERS
    M hw/i386/Kconfig
    M hw/isa/Kconfig
    M hw/isa/Makefile.objs
    A hw/isa/piix3.c
    M hw/pci-host/Kconfig
    M hw/pci-host/piix.c
    M include/hw/southbridge/piix.h

  Log Message:
  -----------
  hw/pci-host/piix: Extract PIIX3 functions to hw/isa/piix3.c

Move all the PIIX3 functions to a new file: hw/isa/piix3.c.

Reviewed-by: Aleksandar Markovic <address@hidden>
Signed-off-by: Philippe Mathieu-Daudé <address@hidden>


  Commit: 0f25d865a1764527546cf159883e880d487363cf
      
https://github.com/qemu/qemu/commit/0f25d865a1764527546cf159883e880d487363cf
  Author: Philippe Mathieu-Daudé <address@hidden>
  Date:   2019-11-05 (Tue, 05 Nov 2019)

  Changed paths:
    M MAINTAINERS
    M hw/i386/Kconfig
    M hw/pci-host/Kconfig
    M hw/pci-host/Makefile.objs
    A hw/pci-host/i440fx.c
    R hw/pci-host/piix.c

  Log Message:
  -----------
  hw/pci-host: Rename incorrectly named 'piix' as 'i440fx'

We moved all the PIIX3 southbridge code out of hw/pci-host/piix.c,
it now only contains i440FX northbridge code.
Rename it to match the chipset modelled.

Reviewed-by: Aleksandar Markovic <address@hidden>
Signed-off-by: Philippe Mathieu-Daudé <address@hidden>


  Commit: 48bc99a09cb160a3a2612c4bd5a8a225ed7bf6fb
      
https://github.com/qemu/qemu/commit/48bc99a09cb160a3a2612c4bd5a8a225ed7bf6fb
  Author: Philippe Mathieu-Daudé <address@hidden>
  Date:   2019-11-05 (Tue, 05 Nov 2019)

  Changed paths:
    M hw/i386/pc_piix.c
    M hw/pci-host/i440fx.c
    M include/hw/pci-host/i440fx.h

  Log Message:
  -----------
  hw/pci-host/i440fx: Remove the last PIIX3 traces

The PIIX3 is not tied to the i440FX and can even be used without it.
Move its creation to the machine code (pc_piix.c).
We have now removed the last trace of southbridge code in the i440FX
northbridge.

Reviewed-by: Aleksandar Markovic <address@hidden>
Signed-off-by: Philippe Mathieu-Daudé <address@hidden>


  Commit: 80d1c10b2243866a86d0c1eb919b94aadda2aba0
      
https://github.com/qemu/qemu/commit/80d1c10b2243866a86d0c1eb919b94aadda2aba0
  Author: Peter Maydell <address@hidden>
  Date:   2019-11-06 (Wed, 06 Nov 2019)

  Changed paths:
    M MAINTAINERS
    M Makefile
    M hw/acpi/pcihp.c
    M hw/acpi/piix4.c
    M hw/core/irq.c
    M hw/i386/Kconfig
    M hw/i386/acpi-build.c
    M hw/i386/pc_piix.c
    M hw/i386/xen/xen-hvm.c
    M hw/intc/apic_common.c
    M hw/isa/Kconfig
    M hw/isa/Makefile.objs
    A hw/isa/piix3.c
    M hw/isa/piix4.c
    M hw/mips/gt64xxx_pci.c
    M hw/mips/mips_malta.c
    M hw/pci-host/Kconfig
    M hw/pci-host/Makefile.objs
    A hw/pci-host/i440fx.c
    R hw/pci-host/piix.c
    M hw/timer/i8254_common.c
    R include/hw/acpi/piix4.h
    M include/hw/i386/pc.h
    M include/hw/irq.h
    M include/hw/isa/isa.h
    A include/hw/pci-host/i440fx.h
    A include/hw/southbridge/piix.h
    M stubs/pci-host-piix.c

  Log Message:
  -----------
  Merge remote-tracking branch 'remotes/philmd-gitlab/tags/mips-next-20191105' 
into staging

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.

# gpg: Signature made Tue 05 Nov 2019 22:48:12 GMT
# gpg:                using RSA key 89C1E78F601EE86C867495CBA2A3FD6EDEADC0DE
# gpg: Good signature from "Philippe Mathieu-Daudé (Phil) <address@hidden>" 
[marginal]
# gpg: WARNING: This key is not certified with sufficiently trusted signatures!
# gpg:          It is not certain that the signature belongs to the owner.
# Primary key fingerprint: 89C1 E78F 601E E86C 8674  95CB A2A3 FD6E DEAD C0DE

* remotes/philmd-gitlab/tags/mips-next-20191105: (21 commits)
  hw/pci-host/i440fx: Remove the last PIIX3 traces
  hw/pci-host: Rename incorrectly named 'piix' as 'i440fx'
  hw/pci-host/piix: Extract PIIX3 functions to hw/isa/piix3.c
  hw/pci-host/piix: Fix code style issues
  hw/pci-host/piix: Move i440FX declarations to hw/pci-host/i440fx.h
  hw/pci-host/piix: Define and use the PIIX IRQ Route Control Registers
  hw/pci-host/piix: Move RCR_IOPORT register definition
  hw/pci-host/piix: Extract piix3_create()
  hw/i386: Remove obsolete LoadStateHandler::load_state_old handlers
  hw/isa/piix4: Move piix4_create() to hw/isa/piix4.c
  hw/mips/mips_malta: Extract the PIIX4 creation code as piix4_create()
  hw/mips/mips_malta: Create IDE hard drive array dynamically
  piix4: Add a MC146818 RTC Controller as specified in datasheet
  piix4: Add an i8254 PIT Controller as specified in datasheet
  piix4: Add an i8257 DMA Controller as specified in datasheet
  piix4: Rename PIIX4 object to piix4-isa
  Revert "irq: introduce qemu_irq_proxy()"
  piix4: Add an i8259 Interrupt Controller as specified in datasheet
  piix4: Add the Reset Control Register
  MAINTAINERS: Keep PIIX4 South Bridge separate from PC Chipsets
  ...

Signed-off-by: Peter Maydell <address@hidden>


Compare: https://github.com/qemu/qemu/compare/4570c2e5fa99...80d1c10b2243
reply via email to
[Prev in Thread] Current Thread [Next in Thread]