This series removes piix-specific and q35-specific code from acpi-build.c, making it generic and without direct dependencies to piix and q35 code.
This series needs to be applied after the following: * [PATCH v3 0/6] pc: Initialization and compat function cleanup * [PATCH V3 0/3] hw/pcie: Multi-root support for Q35 * [PATCH 00/16] pc: Eliminate struct PcGuestInfo For reference, there's a git tree containing this series plus all the dependencies, at: git://github.com/ehabkost/qemu-hacks.git work/acpi-decouple Eduardo Habkost (13): pc: Add PCMachineState::pci_host field acpi: Remove unnecessary check for NULL pci_host acpi: Eliminate acpi_get_i386_pci_host() function acpi: Move DSDT info to PCMachineClass acpi: Simplify s3/s4 property querying acpi: Use &error_abort when getting PCI hotplug properties acpi: Use QOM property to get CPU hotplug I/O base acpi: Always try to init PCI hotplug I/O base acpi: Use PCMachineState::acpi_dev to get ACPI dev acpi: Change acpi_pci_hotplug_enabled() argument to PCMachineState acpi: Don't use find_i440fx() when setting bsel properties intel_iommu.h: Missing sysbus.h include acpi: Don't include q35 and piix headers hw/acpi/cpu_hotplug.c | 3 + hw/acpi/ich9.c | 2 + hw/acpi/piix4.c | 2 + hw/i386/acpi-build.c | 161 +++++++++++++----------------------------- hw/i386/pc_piix.c | 4 ++ hw/i386/pc_q35.c | 6 ++ hw/pci-host/piix.c | 1 + include/hw/acpi/cpu_hotplug.h | 1 + include/hw/acpi/pc-hotplug.h | 4 +- include/hw/i386/intel_iommu.h | 1 + include/hw/i386/pc.h | 3 + 11 files changed, 74 insertions(+), 114 deletions(-) -- 2.1.0
