From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:38363) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1a3wWB-0004WE-Sv for qemu-devel@nongnu.org; Tue, 01 Dec 2015 20:47:40 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1a3wWB-00021Y-2u for qemu-devel@nongnu.org; Tue, 01 Dec 2015 20:47:39 -0500 Received: from mx1.redhat.com ([209.132.183.28]:55711) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1a3wWA-00021U-Tc for qemu-devel@nongnu.org; Tue, 01 Dec 2015 20:47:39 -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 9823B2F148A for ; Wed, 2 Dec 2015 01:47:38 +0000 (UTC) From: Eduardo Habkost Date: Tue, 1 Dec 2015 23:47:02 -0200 Message-Id: <1449020831-8414-8-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 07/16] acpi: Make acpi_build() 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 acpi_build(). Signed-off-by: Eduardo Habkost --- hw/i386/acpi-build.c | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/hw/i386/acpi-build.c b/hw/i386/acpi-build.c index ca11c88..b1548e7 100644 --- a/hw/i386/acpi-build.c +++ b/hw/i386/acpi-build.c @@ -1683,8 +1683,9 @@ static bool acpi_has_iommu(void) } static -void acpi_build(PcGuestInfo *guest_info, AcpiBuildTables *tables) +void acpi_build(PCMachineState *pcms, AcpiBuildTables *tables) { + PcGuestInfo *guest_info = &pcms->acpi_guest_info; GArray *table_offsets; unsigned facs, ssdt, dsdt, rsdt; AcpiCpuInfo cpu; @@ -1855,7 +1856,7 @@ static void acpi_build_update(void *build_opaque, uint32_t offset) acpi_build_tables_init(&tables); - acpi_build(&build_state->pcms->acpi_guest_info, &tables); + acpi_build(build_state->pcms, &tables); acpi_ram_update(build_state->table_mr, tables.table_data); @@ -1921,7 +1922,7 @@ void acpi_setup(PCMachineState *pcms) acpi_set_pci_info(); acpi_build_tables_init(&tables); - acpi_build(&build_state->pcms->acpi_guest_info, &tables); + acpi_build(build_state->pcms, &tables); /* Now expose it all to Guest */ build_state->table_mr = acpi_add_rom_blob(build_state, tables.table_data, -- 2.1.0