From patchwork Wed Dec 2 01:47:01 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Eduardo Habkost X-Patchwork-Id: 551128 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from lists.gnu.org (lists.gnu.org [IPv6:2001:4830:134:3::11]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 36D55140313 for ; Wed, 2 Dec 2015 12:51:39 +1100 (AEDT) Received: from localhost ([::1]:55703 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1a3wa1-0003iO-9K for incoming@patchwork.ozlabs.org; Tue, 01 Dec 2015 20:51:37 -0500 Received: from eggs.gnu.org ([2001:4830:134:3::10]:38334) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1a3wW8-0004Np-D6 for qemu-devel@nongnu.org; Tue, 01 Dec 2015 20:47:37 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1a3wW7-00020Y-Gf for qemu-devel@nongnu.org; Tue, 01 Dec 2015 20:47:36 -0500 Received: from mx1.redhat.com ([209.132.183.28]:55698) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1a3wW7-00020Q-C1 for qemu-devel@nongnu.org; Tue, 01 Dec 2015 20:47:35 -0500 Received: from int-mx13.intmail.prod.int.phx2.redhat.com (int-mx13.intmail.prod.int.phx2.redhat.com [10.5.11.26]) by mx1.redhat.com (Postfix) with ESMTPS id 111952653 for ; Wed, 2 Dec 2015 01:47:35 +0000 (UTC) Received: from localhost (ovpn-113-125.phx2.redhat.com [10.3.113.125]) by int-mx13.intmail.prod.int.phx2.redhat.com (8.14.4/8.14.4) with ESMTP id tB21lY2F009709; Tue, 1 Dec 2015 20:47:34 -0500 From: Eduardo Habkost To: qemu-devel@nongnu.org Date: Tue, 1 Dec 2015 23:47:01 -0200 Message-Id: <1449020831-8414-7-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> X-Scanned-By: MIMEDefang 2.68 on 10.5.11.26 X-detected-operating-system: by eggs.gnu.org: GNU/Linux 3.x X-Received-From: 209.132.183.28 Cc: Igor Mammedov , Marcel Apfelbaum , "Michael S. Tsirkin" Subject: [Qemu-devel] [PATCH 06/16] acpi: Save PCMachineState on AcpiBuildState X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Sender: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org PCMachineState will be used in some of the steps of ACPI table building. Signed-off-by: Eduardo Habkost --- hw/i386/acpi-build.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/hw/i386/acpi-build.c b/hw/i386/acpi-build.c index 85a5c53..ca11c88 100644 --- a/hw/i386/acpi-build.c +++ b/hw/i386/acpi-build.c @@ -1644,7 +1644,7 @@ struct AcpiBuildState { MemoryRegion *table_mr; /* Is table patched? */ uint8_t patched; - PcGuestInfo *guest_info; + PCMachineState *pcms; void *rsdp; MemoryRegion *rsdp_mr; MemoryRegion *linker_mr; @@ -1855,7 +1855,7 @@ static void acpi_build_update(void *build_opaque, uint32_t offset) acpi_build_tables_init(&tables); - acpi_build(build_state->guest_info, &tables); + acpi_build(&build_state->pcms->acpi_guest_info, &tables); acpi_ram_update(build_state->table_mr, tables.table_data); @@ -1916,12 +1916,12 @@ void acpi_setup(PCMachineState *pcms) build_state = g_malloc0(sizeof *build_state); - build_state->guest_info = guest_info; + build_state->pcms = pcms; acpi_set_pci_info(); acpi_build_tables_init(&tables); - acpi_build(build_state->guest_info, &tables); + acpi_build(&build_state->pcms->acpi_guest_info, &tables); /* Now expose it all to Guest */ build_state->table_mr = acpi_add_rom_blob(build_state, tables.table_data,