[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH v2 03/14] pc: Move PcGuestInfo declaration to top of
From: |
Eduardo Habkost |
Subject: |
[Qemu-devel] [PATCH v2 03/14] pc: Move PcGuestInfo declaration to top of file |
Date: |
Fri, 11 Dec 2015 16:42:22 -0200 |
The struct will be used inside PCMachineState.
Signed-off-by: Eduardo Habkost <address@hidden>
---
include/hw/i386/pc.h | 31 ++++++++++++++++---------------
1 file changed, 16 insertions(+), 15 deletions(-)
diff --git a/include/hw/i386/pc.h b/include/hw/i386/pc.h
index 9503dbb..84bc88f 100644
--- a/include/hw/i386/pc.h
+++ b/include/hw/i386/pc.h
@@ -20,6 +20,22 @@
#define HPET_INTCAP "hpet-intcap"
+/* 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
@@ -133,21 +149,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);
--
2.1.0
- [Qemu-devel] [PATCH v2 00/14] pc: Eliminate struct PcGuestInfo, Eduardo Habkost, 2015/12/11
- [Qemu-devel] [PATCH v2 01/14] q35: Remove MCHPCIState.guest_info field, Eduardo Habkost, 2015/12/11
- [Qemu-devel] [PATCH v2 02/14] pc: Group and document related PCMachineState/PCMachineclass fields, Eduardo Habkost, 2015/12/11
- [Qemu-devel] [PATCH v2 03/14] pc: Move PcGuestInfo declaration to top of file,
Eduardo Habkost <=
- [Qemu-devel] [PATCH v2 04/14] pc: Eliminate struct PcGuestInfoState, Eduardo Habkost, 2015/12/11
- [Qemu-devel] [PATCH v2 05/14] pc: Simplify pc_memory_init() signature, Eduardo Habkost, 2015/12/11
- [Qemu-devel] [PATCH v2 06/14] pc: Simplify xen_load_linux() signature, Eduardo Habkost, 2015/12/11
- [Qemu-devel] [PATCH v2 07/14] acpi: Remove guest_info parameters from functions, Eduardo Habkost, 2015/12/11