From patchwork Tue Dec 13 21:45:20 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andrew Jones X-Patchwork-Id: 87951 Delivered-To: patch@linaro.org Received: by 10.140.20.101 with SMTP id 92csp2443939qgi; Tue, 13 Dec 2016 14:02:25 -0800 (PST) X-Received: by 10.200.45.75 with SMTP id o11mr99072647qta.254.1481666545955; Tue, 13 Dec 2016 14:02:25 -0800 (PST) Return-Path: Received: from lists.gnu.org (lists.gnu.org. [208.118.235.17]) by mx.google.com with ESMTPS id g63si28665829qke.185.2016.12.13.14.02.25 for (version=TLS1 cipher=AES128-SHA bits=128/128); Tue, 13 Dec 2016 14:02:25 -0800 (PST) Received-SPF: pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 208.118.235.17 as permitted sender) client-ip=208.118.235.17; Authentication-Results: mx.google.com; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 208.118.235.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+patch=linaro.org@nongnu.org Received: from localhost ([::1]:46702 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1cGv9T-000649-Ax for patch@linaro.org; Tue, 13 Dec 2016 17:02:23 -0500 Received: from eggs.gnu.org ([2001:4830:134:3::10]:53965) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1cGutU-0002gr-Sq for qemu-devel@nongnu.org; Tue, 13 Dec 2016 16:45:56 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1cGutU-0007gB-66 for qemu-devel@nongnu.org; Tue, 13 Dec 2016 16:45:52 -0500 Received: from mx1.redhat.com ([209.132.183.28]:53958) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1cGutN-0007bO-KU; Tue, 13 Dec 2016 16:45:45 -0500 Received: from int-mx09.intmail.prod.int.phx2.redhat.com (int-mx09.intmail.prod.int.phx2.redhat.com [10.5.11.22]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id ADAD17EBA5; Tue, 13 Dec 2016 21:45:44 +0000 (UTC) Received: from kamzik.brq.redhat.com (kamzik.brq.redhat.com [10.34.1.143]) by int-mx09.intmail.prod.int.phx2.redhat.com (8.14.4/8.14.4) with ESMTP id uBDLjOQV014685; Tue, 13 Dec 2016 16:45:42 -0500 From: Andrew Jones To: qemu-devel@nongnu.org, qemu-arm@nongnu.org Date: Tue, 13 Dec 2016 22:45:20 +0100 Message-Id: <20161213214522.25548-10-drjones@redhat.com> In-Reply-To: <20161213214522.25548-1-drjones@redhat.com> References: <20161213214522.25548-1-drjones@redhat.com> X-Scanned-By: MIMEDefang 2.68 on 10.5.11.22 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.27]); Tue, 13 Dec 2016 21:45:44 +0000 (UTC) X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] [fuzzy] X-Received-From: 209.132.183.28 Subject: [Qemu-devel] [PATCH 09/11] hw/arm/virt-acpi-build: don't save VirtGuestInfo on AcpiBuildState X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: peter.maydell@linaro.org, imammedo@redhat.com, mst@redhat.com, ehabkost@redhat.com, zhaoshenglong@huawei.com Errors-To: qemu-devel-bounces+patch=linaro.org@nongnu.org Sender: "Qemu-devel" We can get to VirtMachineState without the need for saving a pointer on AcpiBuildState. This is the mach-virt equivalent to "acpi: Don't save PcGuestInfo on AcpiBuildState" Signed-off-by: Andrew Jones --- hw/arm/virt-acpi-build.c | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) -- 2.9.3 diff --git a/hw/arm/virt-acpi-build.c b/hw/arm/virt-acpi-build.c index 7a1efd0dc538..137781646bec 100644 --- a/hw/arm/virt-acpi-build.c +++ b/hw/arm/virt-acpi-build.c @@ -706,7 +706,6 @@ struct AcpiBuildState { MemoryRegion *linker_mr; /* Is table patched? */ bool patched; - VirtGuestInfo *guest_info; } AcpiBuildState; static @@ -779,6 +778,8 @@ static void acpi_ram_update(MemoryRegion *mr, GArray *data) static void virt_acpi_build_update(void *build_opaque) { + MachineState *machine = MACHINE(qdev_get_machine()); + VirtMachineState *vms = VIRT_MACHINE(machine); AcpiBuildState *build_state = build_opaque; AcpiBuildTables tables; @@ -790,8 +791,7 @@ static void virt_acpi_build_update(void *build_opaque) acpi_build_tables_init(&tables); - virt_acpi_build(container_of(build_state->guest_info, - VirtMachineState, acpi_guest_info), &tables); + virt_acpi_build(vms, &tables); acpi_ram_update(build_state->table_mr, tables.table_data); acpi_ram_update(build_state->rsdp_mr, tables.rsdp); @@ -841,7 +841,6 @@ void virt_acpi_setup(VirtMachineState *vms) } build_state = g_malloc0(sizeof *build_state); - build_state->guest_info = guest_info; acpi_build_tables_init(&tables); virt_acpi_build(vms, &tables);