From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:38219) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1a3wVx-00046i-H3 for qemu-devel@nongnu.org; Tue, 01 Dec 2015 20:47:26 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1a3wVw-0001x8-Ie for qemu-devel@nongnu.org; Tue, 01 Dec 2015 20:47:25 -0500 Received: from mx1.redhat.com ([209.132.183.28]:40403) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1a3wVw-0001x4-D7 for qemu-devel@nongnu.org; Tue, 01 Dec 2015 20:47:24 -0500 Received: from int-mx14.intmail.prod.int.phx2.redhat.com (int-mx14.intmail.prod.int.phx2.redhat.com [10.5.11.27]) by mx1.redhat.com (Postfix) with ESMTPS id 091D690C8D for ; Wed, 2 Dec 2015 01:47:24 +0000 (UTC) From: Eduardo Habkost Date: Tue, 1 Dec 2015 23:46:56 -0200 Message-Id: <1449020831-8414-2-git-send-email-ehabkost@redhat.com> In-Reply-To: <1449020831-8414-1-git-send-email-ehabkost@redhat.com> References: <1449020831-8414-1-git-send-email-ehabkost@redhat.com> Subject: [Qemu-devel] [PATCH 01/16] pc: Move PcGuestInfo declaration to top of file List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Cc: Igor Mammedov , Marcel Apfelbaum , "Michael S. Tsirkin" The struct will be used inside PCMachineState. Signed-off-by: Eduardo Habkost --- 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 9811229..a74bded 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 @@ -109,21 +125,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