From mboxrd@z Thu Jan 1 00:00:00 1970 Received: by 10.103.86.15 with SMTP id k15csp749854vsb; Thu, 15 Dec 2016 06:46:13 -0800 (PST) X-Received: by 10.200.53.53 with SMTP id y50mr1590681qtb.127.1481813173388; Thu, 15 Dec 2016 06:46:13 -0800 (PST) Return-Path: Received: from lists.gnu.org (lists.gnu.org. [208.118.235.17]) by mx.google.com with ESMTPS id m1si1151848qtd.80.2016.12.15.06.46.13 for (version=TLS1 cipher=AES128-SHA bits=128/128); Thu, 15 Dec 2016 06:46:13 -0800 (PST) Received-SPF: pass (google.com: domain of qemu-arm-bounces+alex.bennee=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-arm-bounces+alex.bennee=linaro.org@nongnu.org designates 208.118.235.17 as permitted sender) smtp.mailfrom=qemu-arm-bounces+alex.bennee=linaro.org@nongnu.org Received: from localhost ([::1]:55014 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1cHXIR-00084a-6i for alex.bennee@linaro.org; Thu, 15 Dec 2016 09:46:11 -0500 Received: from eggs.gnu.org ([2001:4830:134:3::10]:60575) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1cHXIK-0007sA-U9 for qemu-arm@nongnu.org; Thu, 15 Dec 2016 09:46:06 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1cHXIH-0005pG-SM for qemu-arm@nongnu.org; Thu, 15 Dec 2016 09:46:04 -0500 Received: from mx1.redhat.com ([209.132.183.28]:34162) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1cHXIH-0005oN-KF; Thu, 15 Dec 2016 09:46:01 -0500 Received: from int-mx14.intmail.prod.int.phx2.redhat.com (int-mx14.intmail.prod.int.phx2.redhat.com [10.5.11.27]) (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 5C919624CE; Thu, 15 Dec 2016 14:45:59 +0000 (UTC) Received: from nial.brq.redhat.com (dhcp-1-118.brq.redhat.com [10.34.1.118]) by int-mx14.intmail.prod.int.phx2.redhat.com (8.14.4/8.14.4) with ESMTP id uBFEjv2Z029843; Thu, 15 Dec 2016 09:45:57 -0500 Date: Thu, 15 Dec 2016 15:45:55 +0100 From: Igor Mammedov To: Andrew Jones Message-ID: <20161215154555.6137b8f7@nial.brq.redhat.com> In-Reply-To: <20161213214522.25548-8-drjones@redhat.com> References: <20161213214522.25548-1-drjones@redhat.com> <20161213214522.25548-8-drjones@redhat.com> MIME-Version: 1.0 Content-Type: text/plain; charset=US-ASCII Content-Transfer-Encoding: 7bit X-Scanned-By: MIMEDefang 2.68 on 10.5.11.27 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.39]); Thu, 15 Dec 2016 14:45:59 +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: Re: [Qemu-arm] [Qemu-devel] [PATCH 07/11] hw/arm/virt: pass VirtMachineState instead of VirtGuestInfo X-BeenThere: qemu-arm@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, ehabkost@redhat.com, mst@redhat.com, qemu-devel@nongnu.org, qemu-arm@nongnu.org, zhaoshenglong@huawei.com Errors-To: qemu-arm-bounces+alex.bennee=linaro.org@nongnu.org Sender: "Qemu-arm" X-TUID: QHhmZYiqP/Cy On Tue, 13 Dec 2016 22:45:18 +0100 Andrew Jones wrote: > Only two functions take VirtGuestInfo parameters. Now that guest-info > is part of VirtMachineState, and VirtMachineState is defined in the > virt header, pass that instead. > > Signed-off-by: Andrew Jones > --- > hw/arm/virt-acpi-build.c | 3 ++- > hw/arm/virt.c | 8 ++++---- > include/hw/arm/virt.h | 2 +- > 3 files changed, 7 insertions(+), 6 deletions(-) > > diff --git a/hw/arm/virt-acpi-build.c b/hw/arm/virt-acpi-build.c > index db44e2dd5f12..f7ce6aeed307 100644 > --- a/hw/arm/virt-acpi-build.c > +++ b/hw/arm/virt-acpi-build.c > @@ -822,8 +822,9 @@ static const VMStateDescription vmstate_virt_acpi_build = { > }, > }; > > -void virt_acpi_setup(VirtGuestInfo *guest_info) > +void virt_acpi_setup(VirtMachineState *vms) > { > + VirtGuestInfo *guest_info = &vms->acpi_guest_info; > AcpiBuildTables tables; > AcpiBuildState *build_state; > > diff --git a/hw/arm/virt.c b/hw/arm/virt.c > index 7860fade52f1..bcf8a2954c16 100644 > --- a/hw/arm/virt.c > +++ b/hw/arm/virt.c > @@ -1156,9 +1156,9 @@ static void *machvirt_dtb(const struct arm_boot_info *binfo, int *fdt_size) > return board->fdt; > } > > -static void virt_build_smbios(VirtGuestInfo *guest_info) > +static void virt_build_smbios(VirtMachineState *vms) Looks like all it needs is 'fw_cfg' If there aren't plans to use more data from VirtMachineState, just passing fw_cfg should be enough. > { > - FWCfgState *fw_cfg = guest_info->fw_cfg; > + FWCfgState *fw_cfg = vms->acpi_guest_info.fw_cfg; > uint8_t *smbios_tables, *smbios_anchor; > size_t smbios_tables_len, smbios_anchor_len; > const char *product = "QEMU Virtual Machine"; > @@ -1191,8 +1191,8 @@ void virt_machine_done(Notifier *notifier, void *data) > VirtMachineState *vms = container_of(notifier, VirtMachineState, > machine_done); > > - virt_acpi_setup(&vms->acpi_guest_info); > - virt_build_smbios(&vms->acpi_guest_info); > + virt_acpi_setup(vms); > + virt_build_smbios(vms); > } > > static void machvirt_init(MachineState *machine) > diff --git a/include/hw/arm/virt.h b/include/hw/arm/virt.h > index 77d25dbddb62..cbedc682ae99 100644 > --- a/include/hw/arm/virt.h > +++ b/include/hw/arm/virt.h > @@ -128,6 +128,6 @@ typedef struct { > OBJECT_CLASS_CHECK(VirtMachineClass, klass, TYPE_VIRT_MACHINE) > > > -void virt_acpi_setup(VirtGuestInfo *guest_info); > +void virt_acpi_setup(VirtMachineState *vms); > > #endif /* QEMU_ARM_VIRT_H */