Mostly trivial cleanups in preparation of a v2 of "hw/ide: Untangle ISA/PCI abuses of ide_init_ioport()": https://lore.kernel.org/qemu-devel/20230208000743.79415-1-phi...@linaro.org/
Bernhard Beschow (1): hw/ide/pci: Unexport bmdma_active_if() John Snow (1): MAINTAINERS: Mark IDE and Floppy as "Odd Fixes" Philippe Mathieu-Daudé (18): hw/ide/mmio: Use CamelCase for MMIO_IDE state name hw/ide/mmio: Extract TYPE_MMIO_IDE declarations to 'hw/ide/mmio.h' hw/ide/isa: Extract TYPE_ISA_IDE declarations to 'hw/ide/isa.h' hw/ide/isa: Remove intermediate ISAIDEState::irq variable hw/ide/atapi: Restrict 'scsi/constants.h' inclusion hw/ide: Remove unused 'qapi/qapi-types-run-state.h' hw/ide: Include 'exec/ioport.h' instead of 'hw/isa/isa.h' hw/ide: Un-inline ide_set_irq() hw/ide: Rename ide_set_irq() -> ide_bus_set_irq() hw/ide: Rename ide_create_drive() -> ide_bus_create_drive() hw/ide: Rename ide_register_restart_cb -> ide_bus_register_restart_cb hw/ide: Rename ide_exec_cmd() -> ide_bus_exec_cmd() hw/ide: Rename ide_init2() -> ide_bus_init_output_irq() hw/ide: Rename idebus_active_if() -> ide_bus_active_if() hw/ide/ioport: Remove unnecessary includes hw/ide/piix: Remove unused includes hw/ide/piix: Pass Error* to pci_piix_init_ports() for better error msg hw/ide/piix: Refactor pci_piix_init_ports as pci_piix_init_bus per bus MAINTAINERS | 4 +- hw/arm/sbsa-ref.c | 2 +- hw/i386/pc_piix.c | 1 + hw/ide/ahci.c | 9 +++-- hw/ide/atapi.c | 13 ++++--- hw/ide/cmd646.c | 4 +- hw/ide/core.c | 80 +++++++++++++++++++++------------------ hw/ide/ich.c | 1 + hw/ide/ioport.c | 10 ----- hw/ide/isa.c | 22 +++++------ hw/ide/macio.c | 15 ++++---- hw/ide/microdrive.c | 9 +++-- hw/ide/mmio.c | 37 ++++++++---------- hw/ide/pci.c | 11 +++++- hw/ide/piix.c | 46 ++++++++++------------ hw/ide/qdev.c | 2 +- hw/ide/sii3112.c | 4 +- hw/ide/trace-events | 2 +- hw/ide/via.c | 4 +- hw/misc/macio/gpio.c | 1 + hw/sh4/r2d.c | 2 +- hw/sparc64/sun4u.c | 1 + include/hw/ide.h | 8 ---- include/hw/ide/internal.h | 25 ++++-------- include/hw/ide/isa.h | 20 ++++++++++ include/hw/ide/mmio.h | 26 +++++++++++++ include/hw/ide/pci.h | 6 --- 27 files changed, 193 insertions(+), 172 deletions(-) create mode 100644 include/hw/ide/isa.h create mode 100644 include/hw/ide/mmio.h -- 2.38.1
