The following changes since commit 760b4dcdddba4a40b9fa0eb78fdfc7eda7cb83d0:

  Merge tag 'for-upstream' of https://gitlab.com/bonzini/qemu into staging (2024-02-20 10:11:08 +0000)

are available in the Git repository at:

  https://github.com/philmd/qemu.git tags/hw-misc-20240222

for you to fetch changes up to 7164f7e4028ad3b01a5f98c27482587b401ad420:

  hw/sparc/leon3: Fix wrong usage of DO_UPCAST macro (2024-02-22 12:47:40 +0100)

Supersedes: <20240221211626.48190-1-philmd@linaro.org>

Following checkpatch.pl error ignored:

  ERROR: Macros with complex values should be enclosed in parenthesis
  #62: FILE: include/hw/ide/ide-dev.h:31:
  +#define DEFINE_IDE_DEV_PROPERTIES()                     \
  +    DEFINE_BLOCK_PROPERTIES(IDEDrive, dev.conf),        \
  +    DEFINE_BLOCK_ERROR_PROPERTIES(IDEDrive, dev.conf),  \
  +    DEFINE_PROP_STRING("ver",  IDEDrive, dev.version),  \
  +    DEFINE_PROP_UINT64("wwn",  IDEDrive, dev.wwn, 0),   \
  +    DEFINE_PROP_STRING("serial",  IDEDrive, dev.serial),\
  +    DEFINE_PROP_STRING("model", IDEDrive, dev.model)

----------------------------------------------------------------
Misc HW patch queue

- Remove sysbus_add_io (Phil)
- Build PPC 4xx PCI host bridges once (Phil)
- Display QOM path while debugging SMBus targets (Joe)
- Simplify x86 PC code (Bernhard)
- Remove qemu_[un]register_reset() calls in x86 PC CMOS (Peter)
- Fix wiring of ICH9 LPC interrupts (Bernhard)
- Split core IDE as device / bus / dma (Thomas)
- Prefer QDev API over QOM for devices (Phil)
- Fix invalid use of DO_UPCAST() in Leon3 (Thomas)

----------------------------------------------------------------

Bernhard Beschow (8):
  hw/i386/pc_piix: Share pc_cmos_init() invocation between pc and isapc
    machines
  hw/i386/x86: Turn apic_xrupt_override into class attribute
  hw/i386/pc: Merge pc_guest_info_init() into pc_machine_initfn()
  hw/i386/pc: Defer smbios_set_defaults() to machine_done
  hw/i386/pc: Confine system flash handling to pc_sysfw
  hw/i386/pc_sysfw: Inline pc_system_flash_create() and remove it
  hw/i386/pc_q35: Populate interrupt handlers before realizing LPC PCI
    function
  hw/isa/meson.build: Sort alphabetically

Joe Komlodi (1):
  hw/i2c/smbus_slave: Add object path on error prints

Peter Maydell (2):
  hw/i386/pc: Store pointers to IDE buses in PCMachineState
  hw/i386/pc: Do pc_cmos_init_late() from pc_machine_done()

Philippe Mathieu-Daudé (13):
  hw/input/pckbd: Open-code i8042_setup_a20_line() wrapper
  hw/sysbus: Inline and remove sysbus_add_io()
  hw/ppc/ppc4xx_pci: Remove unused "hw/ppc/ppc.h" header
  hw/ppc/ppc4xx_pci: Extract PCI host definitions to
    hw/pci-host/ppc4xx.h
  hw/ppc/ppc4xx_pci: Move ppc4xx_pci.c to hw/pci-host/
  hw/ppc/ppc440_pcix: Move ppc440_pcix.c to hw/pci-host/
  hw/ppc/spapr_cpu: Use qdev_is_realized() instead of QOM API
  hw/ppc/pnv_bmc: Use qdev_new() instead of QOM API
  hw/tricore/testboard: Use qdev_new() instead of QOM basic API
  hw/i386/pc_sysfw: Use qdev_is_realized() instead of QOM API
  hw/acpi: Include missing 'qapi/qapi-types-acpi.h' generated header
  hw/acpi/cpu: Use CPUState typedef
  hw/acpi/ich9_tco: Include missing 'migration/vmstate.h' header

Thomas Huth (8):
  hw/ide: Add the possibility to disable the CompactFlash device in the
    build
  hw/ide: Split qdev.c into ide-bus.c and ide-dev.c
  hw/ide: Move IDE DMA related definitions to a separate header
    ide-dma.h
  hw/ide: Move IDE device related definitions to ide-dev.h
  hw/ide: Move IDE bus related definitions to a new header ide-bus.h
  hw/ide: Remove the include/hw/ide.h legacy file
  hw/ide: Stop exposing internal.h to non-IDE files
  hw/sparc/leon3: Fix wrong usage of DO_UPCAST macro

 MAINTAINERS                             |   5 +-
 hw/i386/fw_cfg.h                        |   3 +-
 include/hw/acpi/cpu.h                   |   3 +-
 include/hw/acpi/ich9_tco.h              |   1 +
 include/hw/acpi/memory_hotplug.h        |   1 +
 include/hw/i386/pc.h                    |   9 +-
 include/hw/i386/x86.h                   |   3 +-
 include/hw/ide.h                        |   9 -
 include/hw/ide/ide-bus.h                |  42 +++++
 include/hw/ide/ide-dev.h                | 184 +++++++++++++++++++++
 include/hw/ide/ide-dma.h                |  37 +++++
 include/hw/ide/internal.h               | 211 +-----------------------
 include/hw/ide/pci.h                    |   2 +-
 include/hw/input/i8042.h                |   1 -
 include/hw/pci-host/ppc4xx.h            |  17 ++
 include/hw/ppc/ppc4xx.h                 |   5 -
 include/hw/sysbus.h                     |   2 -
 include/hw/tricore/tricore_testdevice.h |   3 -
 hw/core/sysbus.c                        |   6 -
 hw/i2c/smbus_slave.c                    |   8 +-
 hw/i386/acpi-common.c                   |   3 +-
 hw/i386/fw_cfg.c                        |  12 +-
 hw/i386/kvmvapic.c                      |   3 +-
 hw/i386/pc.c                            |  60 +++----
 hw/i386/pc_piix.c                       |  31 +---
 hw/i386/pc_q35.c                        |  22 +--
 hw/i386/pc_sysfw.c                      |  23 +--
 hw/ide/cf.c                             |  58 +++++++
 hw/ide/cmd646.c                         |   1 +
 hw/ide/ide-bus.c                        | 111 +++++++++++++
 hw/ide/{qdev.c => ide-dev.c}            | 137 +--------------
 hw/ide/pci.c                            |   1 +
 hw/ide/piix.c                           |   1 +
 hw/ide/sii3112.c                        |   1 +
 hw/ide/via.c                            |   1 +
 hw/input/pckbd.c                        |   5 -
 hw/mips/mipssim.c                       |   3 +-
 hw/nvram/fw_cfg.c                       |   6 +-
 hw/{ppc => pci-host}/ppc440_pcix.c      |   3 +-
 hw/{ppc => pci-host}/ppc4xx_pci.c       |   3 +-
 hw/pci-host/ppce500.c                   |   2 +-
 hw/ppc/pnv_bmc.c                        |  10 +-
 hw/ppc/ppc440_bamboo.c                  |   1 +
 hw/ppc/ppc440_uc.c                      |   1 +
 hw/ppc/sam460ex.c                       |   1 +
 hw/ppc/spapr_cpu_core.c                 |   3 +-
 hw/sparc/leon3.c                        |   2 +-
 hw/tricore/tricore_testboard.c          |   4 +-
 hw/arm/Kconfig                          |   2 +
 hw/ide/Kconfig                          |  32 ++--
 hw/ide/meson.build                      |   4 +-
 hw/isa/meson.build                      |   2 +-
 hw/pci-host/Kconfig                     |   8 +
 hw/pci-host/meson.build                 |   2 +
 hw/pci-host/trace-events                |  12 ++
 hw/ppc/Kconfig                          |   3 +-
 hw/ppc/meson.build                      |   3 +-
 hw/ppc/trace-events                     |  12 --
 58 files changed, 607 insertions(+), 534 deletions(-)
 delete mode 100644 include/hw/ide.h
 create mode 100644 include/hw/ide/ide-bus.h
 create mode 100644 include/hw/ide/ide-dev.h
 create mode 100644 include/hw/ide/ide-dma.h
 create mode 100644 include/hw/pci-host/ppc4xx.h
 create mode 100644 hw/ide/cf.c
 create mode 100644 hw/ide/ide-bus.c
 rename hw/ide/{qdev.c => ide-dev.c} (67%)
 rename hw/{ppc => pci-host}/ppc440_pcix.c (99%)
 rename hw/{ppc => pci-host}/ppc4xx_pci.c (99%)

-- 
2.41.0

On Thu, 22 Feb 2024 at 12:58, Philippe Mathieu-Daudé <philmd@linaro.org> wrote:
>
> The following changes since commit 760b4dcdddba4a40b9fa0eb78fdfc7eda7cb83d0:
>
>   Merge tag 'for-upstream' of https://gitlab.com/bonzini/qemu into staging (2024-02-20 10:11:08 +0000)
>
> are available in the Git repository at:
>
>   https://github.com/philmd/qemu.git tags/hw-misc-20240222
>
> for you to fetch changes up to 7164f7e4028ad3b01a5f98c27482587b401ad420:
>
>   hw/sparc/leon3: Fix wrong usage of DO_UPCAST macro (2024-02-22 12:47:40 +0100)
>
> Supersedes: <20240221211626.48190-1-philmd@linaro.org>
>
> Following checkpatch.pl error ignored:
>
>   ERROR: Macros with complex values should be enclosed in parenthesis
>   #62: FILE: include/hw/ide/ide-dev.h:31:
>   +#define DEFINE_IDE_DEV_PROPERTIES()                     \
>   +    DEFINE_BLOCK_PROPERTIES(IDEDrive, dev.conf),        \
>   +    DEFINE_BLOCK_ERROR_PROPERTIES(IDEDrive, dev.conf),  \
>   +    DEFINE_PROP_STRING("ver",  IDEDrive, dev.version),  \
>   +    DEFINE_PROP_UINT64("wwn",  IDEDrive, dev.wwn, 0),   \
>   +    DEFINE_PROP_STRING("serial",  IDEDrive, dev.serial),\
>   +    DEFINE_PROP_STRING("model", IDEDrive, dev.model)
>
> ----------------------------------------------------------------
> Misc HW patch queue
>
> - Remove sysbus_add_io (Phil)
> - Build PPC 4xx PCI host bridges once (Phil)
> - Display QOM path while debugging SMBus targets (Joe)
> - Simplify x86 PC code (Bernhard)
> - Remove qemu_[un]register_reset() calls in x86 PC CMOS (Peter)
> - Fix wiring of ICH9 LPC interrupts (Bernhard)
> - Split core IDE as device / bus / dma (Thomas)
> - Prefer QDev API over QOM for devices (Phil)
> - Fix invalid use of DO_UPCAST() in Leon3 (Thomas)
>


Applied, thanks.

Please update the changelog at https://wiki.qemu.org/ChangeLog/9.0
for any user-visible changes.

-- PMM