diff options
| author | Eduardo Habkost <ehabkost@redhat.com> | 2015-12-11 16:42:22 -0200 |
|---|---|---|
| committer | Michael S. Tsirkin <mst@redhat.com> | 2016-02-06 20:44:09 +0200 |
| commit | 281b104702af40b08b29b621995830c0c0177a41 (patch) | |
| tree | 6d0cf0af6d6ef42e00f17bfd2728dd574f493ff6 | |
| parent | 52ba4d509d1e5287bd8fdb477532713358887356 (diff) | |
pc: Move PcGuestInfo declaration to top of file
The struct will be used inside PCMachineState.
Signed-off-by: Eduardo Habkost <ehabkost@redhat.com>
Reviewed-by: Michael S. Tsirkin <mst@redhat.com>
Signed-off-by: Michael S. Tsirkin <mst@redhat.com>
Reviewed-by: Marcel Apfelbaum <marcel@redhat.com>
| -rw-r--r-- | include/hw/i386/pc.h | 31 |
1 files changed, 16 insertions, 15 deletions
diff --git a/include/hw/i386/pc.h b/include/hw/i386/pc.h index 65e8f245a8..212eb7dcfa 100644 --- a/include/hw/i386/pc.h +++ b/include/hw/i386/pc.h @@ -33,6 +33,22 @@ #define kvm_ioapic_in_kernel() 0 #endif +/* Machine info for ACPI build: */ +struct PcGuestInfo { + bool isapc_ram_fw; + hwaddr ram_size, ram_size_below_4g; + unsigned apic_id_limit; + bool apic_xrupt_override; + uint64_t numa_nodes; + uint64_t *node_mem; + uint64_t *node_cpu; + FWCfgState *fw_cfg; + int legacy_acpi_table_size; + bool has_acpi_build; + bool has_reserved_memory; + bool rsdp_in_ram; +}; + /** * PCMachineState: * @acpi_dev: link to ACPI PM device that performs ACPI hotplug handling @@ -151,21 +167,6 @@ typedef struct PcPciInfo { #define ACPI_PM_PROP_GPE0_BLK_LEN "gpe0_blk_len" #define ACPI_PM_PROP_TCO_ENABLED "enable_tco" -struct PcGuestInfo { - bool isapc_ram_fw; - hwaddr ram_size, ram_size_below_4g; - unsigned apic_id_limit; - bool apic_xrupt_override; - uint64_t numa_nodes; - uint64_t *node_mem; - uint64_t *node_cpu; - FWCfgState *fw_cfg; - int legacy_acpi_table_size; - bool has_acpi_build; - bool has_reserved_memory; - bool rsdp_in_ram; -}; - /* parallel.c */ void parallel_hds_isa_init(ISABus *bus, int n); |