From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:38395) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1a3wWG-0004gK-8P for qemu-devel@nongnu.org; Tue, 01 Dec 2015 20:47:45 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1a3wWD-00022F-A2 for qemu-devel@nongnu.org; Tue, 01 Dec 2015 20:47:44 -0500 Received: from mx1.redhat.com ([209.132.183.28]:52703) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1a3wWD-000225-52 for qemu-devel@nongnu.org; Tue, 01 Dec 2015 20:47:41 -0500 Received: from int-mx10.intmail.prod.int.phx2.redhat.com (int-mx10.intmail.prod.int.phx2.redhat.com [10.5.11.23]) by mx1.redhat.com (Postfix) with ESMTPS id D25EFC0CC621 for ; Wed, 2 Dec 2015 01:47:40 +0000 (UTC) From: Eduardo Habkost Date: Tue, 1 Dec 2015 23:47:03 -0200 Message-Id: <1449020831-8414-9-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 08/16] acpi: Make build_srat() get PCMachineState as argument 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" Some PCMachineState and PCMachineClass fields will be used by build_srat(). Signed-off-by: Eduardo Habkost --- hw/i386/acpi-build.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/hw/i386/acpi-build.c b/hw/i386/acpi-build.c index b1548e7..8841798 100644 --- a/hw/i386/acpi-build.c +++ b/hw/i386/acpi-build.c @@ -1453,8 +1453,9 @@ acpi_build_srat_memory(AcpiSratMemoryAffinity *numamem, uint64_t base, } static void -build_srat(GArray *table_data, GArray *linker, PcGuestInfo *guest_info) +build_srat(GArray *table_data, GArray *linker, PCMachineState *pcms) { + PcGuestInfo *guest_info = &pcms->acpi_guest_info; AcpiSystemResourceAffinityTable *srat; AcpiSratProcessorAffinity *core; AcpiSratMemoryAffinity *numamem; @@ -1463,7 +1464,6 @@ build_srat(GArray *table_data, GArray *linker, PcGuestInfo *guest_info) uint64_t curnode; int srat_start, numa_start, slots; uint64_t mem_len, mem_base, next_base; - PCMachineState *pcms = PC_MACHINE(qdev_get_machine()); ram_addr_t hotplugabble_address_space_size = object_property_get_int(OBJECT(pcms), PC_MACHINE_MEMHP_REGION_SIZE, NULL); @@ -1756,7 +1756,7 @@ void acpi_build(PCMachineState *pcms, AcpiBuildTables *tables) } if (guest_info->numa_nodes) { acpi_add_table(table_offsets, tables_blob); - build_srat(tables_blob, tables->linker, guest_info); + build_srat(tables_blob, tables->linker, pcms); } if (acpi_get_mcfg(&mcfg)) { acpi_add_table(table_offsets, tables_blob); -- 2.1.0