This moves all data from PcGuestInfo to either PCMachineState or PCMachineClass.
This series depends on other two series: * [PATCH v3 0/6] pc: Initialization and compat function cleanup * [PATCH V3 0/3] hw/pcie: Multi-root support for Q35 For reference, there's a git tree containing this series plus all the dependencies, at: git://github.com/ehabkost/qemu-hacks.git work/pcguestinfo-eliminate Changes v1 -> v2: * Remove PCMachineState field from AcpiBuildState, use qdev_get_machine() instead * Reorder series and squash some patches together Eduardo Habkost (14): q35: Remove MCHPCIState.guest_info field pc: Group and document related PCMachineState/PCMachineclass fields pc: Move PcGuestInfo declaration to top of file pc: Eliminate struct PcGuestInfoState pc: Simplify pc_memory_init() signature pc: Simplify xen_load_linux() signature acpi: Remove guest_info parameters from functions acpi: Don't save PcGuestInfo on AcpiBuildState pc: Remove compat fields from PcGuestInfo pc: Remove RAM size fields from PcGuestInfo pc: Remove PcGuestInfo.isapc_ram_fw field pc: Move PcGuestInfo.fw_cfg to PCMachineState pc: Move APIC and NUMA data from PcGuestInfo to PCMachineState pc: Eliminate PcGuestInfo struct hw/i386/acpi-build.c | 77 +++++++++++++++++++++-------------------- hw/i386/acpi-build.h | 2 +- hw/i386/pc.c | 77 +++++++++++++++++------------------------ hw/i386/pc_piix.c | 14 ++------ hw/i386/pc_q35.c | 15 ++------ include/hw/i386/pc.h | 88 ++++++++++++++++++++++++++++------------------- include/hw/pci-host/q35.h | 1 - 7 files changed, 129 insertions(+), 145 deletions(-) -- 2.1.0
