From patchwork Wed Dec 2 01:46:59 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Eduardo Habkost X-Patchwork-Id: 551123 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 816CA1402C6 for ; Wed, 2 Dec 2015 12:48:11 +1100 (AEDT) Received: from localhost ([::1]:55664 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1a3wWf-0005aZ-Gj for incoming@patchwork.ozlabs.org; Tue, 01 Dec 2015 20:48:09 -0500 Received: from eggs.gnu.org ([2001:4830:134:3::10]:38306) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1a3wW6-0004Jq-BV for qemu-devel@nongnu.org; Tue, 01 Dec 2015 20:47:35 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1a3wW3-0001zI-4v for qemu-devel@nongnu.org; Tue, 01 Dec 2015 20:47:34 -0500 Received: from mx1.redhat.com ([209.132.183.28]:43718) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1a3wW3-0001z4-02 for qemu-devel@nongnu.org; Tue, 01 Dec 2015 20:47:31 -0500 Received: from int-mx11.intmail.prod.int.phx2.redhat.com (int-mx11.intmail.prod.int.phx2.redhat.com [10.5.11.24]) by mx1.redhat.com (Postfix) with ESMTPS id ADB82354184 for ; Wed, 2 Dec 2015 01:47:30 +0000 (UTC) Received: from localhost (ovpn-113-125.phx2.redhat.com [10.3.113.125]) by int-mx11.intmail.prod.int.phx2.redhat.com (8.14.4/8.14.4) with ESMTP id tB21lTpX015621; Tue, 1 Dec 2015 20:47:30 -0500 From: Eduardo Habkost To: qemu-devel@nongnu.org Date: Tue, 1 Dec 2015 23:46:59 -0200 Message-Id: <1449020831-8414-5-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.24 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 04/16] acpi: Make acpi_setup() get PCMachineState as argument 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 Lots of PcGuestInfo fields are duplicates of PCMachineClass or PCMachineState fields. Pass PCMachineState as argument to acpi_setup(), so we can simply let the ACPI code use those fields directly. Signed-off-by: Eduardo Habkost --- hw/i386/acpi-build.c | 3 ++- hw/i386/acpi-build.h | 2 +- hw/i386/pc.c | 2 +- 3 files changed, 4 insertions(+), 3 deletions(-) diff --git a/hw/i386/acpi-build.c b/hw/i386/acpi-build.c index bca3f06..74f0922 100644 --- a/hw/i386/acpi-build.c +++ b/hw/i386/acpi-build.c @@ -1893,8 +1893,9 @@ static const VMStateDescription vmstate_acpi_build = { }, }; -void acpi_setup(PcGuestInfo *guest_info) +void acpi_setup(PCMachineState *pcms) { + PcGuestInfo *guest_info = &pcms->acpi_guest_info; AcpiBuildTables tables; AcpiBuildState *build_state; diff --git a/hw/i386/acpi-build.h b/hw/i386/acpi-build.h index e57b1aa..132aba2 100644 --- a/hw/i386/acpi-build.h +++ b/hw/i386/acpi-build.h @@ -4,6 +4,6 @@ #include "qemu/typedefs.h" -void acpi_setup(PcGuestInfo *); +void acpi_setup(PCMachineState *pcms); #endif diff --git a/hw/i386/pc.c b/hw/i386/pc.c index a17e5b3e..fc98a20 100644 --- a/hw/i386/pc.c +++ b/hw/i386/pc.c @@ -1179,7 +1179,7 @@ void pc_machine_done(Notifier *notifier, void *data) } } - acpi_setup(&pcms->acpi_guest_info); + acpi_setup(pcms); } PcGuestInfo *pc_guest_info_init(PCMachineState *pcms)