From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:60453) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1a8qaz-0000v6-7X for qemu-devel@nongnu.org; Tue, 15 Dec 2015 09:28:57 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1a8qav-0005ZS-T4 for qemu-devel@nongnu.org; Tue, 15 Dec 2015 09:28:53 -0500 Received: from mx1.redhat.com ([209.132.183.28]:35110) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1a8qav-0005ZO-MA for qemu-devel@nongnu.org; Tue, 15 Dec 2015 09:28:49 -0500 Received: from int-mx09.intmail.prod.int.phx2.redhat.com (int-mx09.intmail.prod.int.phx2.redhat.com [10.5.11.22]) by mx1.redhat.com (Postfix) with ESMTPS id 4DBAF3B712 for ; Tue, 15 Dec 2015 14:28:49 +0000 (UTC) References: <1449859353-1574-1-git-send-email-ehabkost@redhat.com> <1449859353-1574-13-git-send-email-ehabkost@redhat.com> From: Marcel Apfelbaum Message-ID: <5670239E.90903@redhat.com> Date: Tue, 15 Dec 2015 16:28:46 +0200 MIME-Version: 1.0 In-Reply-To: <1449859353-1574-13-git-send-email-ehabkost@redhat.com> Content-Type: text/plain; charset=windows-1252; format=flowed Content-Transfer-Encoding: 7bit Subject: Re: [Qemu-devel] [PATCH v2 12/14] pc: Move PcGuestInfo.fw_cfg to PCMachineState List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: Eduardo Habkost , qemu-devel@nongnu.org Cc: Igor Mammedov , Marcel Apfelbaum , "Michael S. Tsirkin" On 12/11/2015 08:42 PM, Eduardo Habkost wrote: > Signed-off-by: Eduardo Habkost > --- > hw/i386/acpi-build.c | 7 +++---- > hw/i386/pc.c | 10 ++++------ > include/hw/i386/pc.h | 2 +- > 3 files changed, 8 insertions(+), 11 deletions(-) > > diff --git a/hw/i386/acpi-build.c b/hw/i386/acpi-build.c > index 9598eac..43d8166 100644 > --- a/hw/i386/acpi-build.c > +++ b/hw/i386/acpi-build.c > @@ -1902,11 +1902,10 @@ void acpi_setup(void) > { > PCMachineState *pcms = PC_MACHINE(qdev_get_machine()); > PCMachineClass *pcmc = PC_MACHINE_GET_CLASS(pcms); > - PcGuestInfo *guest_info = &pcms->acpi_guest_info; > AcpiBuildTables tables; > AcpiBuildState *build_state; > > - if (!guest_info->fw_cfg) { > + if (!pcms->fw_cfg) { > ACPI_BUILD_DPRINTF("No fw cfg. Bailing out.\n"); > return; > } > @@ -1937,7 +1936,7 @@ void acpi_setup(void) > build_state->linker_mr = > acpi_add_rom_blob(build_state, tables.linker, "etc/table-loader", 0); > > - fw_cfg_add_file(guest_info->fw_cfg, ACPI_BUILD_TPMLOG_FILE, > + fw_cfg_add_file(pcms->fw_cfg, ACPI_BUILD_TPMLOG_FILE, > tables.tcpalog->data, acpi_data_len(tables.tcpalog)); > > if (!pcmc->rsdp_in_ram) { > @@ -1949,7 +1948,7 @@ void acpi_setup(void) > uint32_t rsdp_size = acpi_data_len(tables.rsdp); > > build_state->rsdp = g_memdup(tables.rsdp->data, rsdp_size); > - fw_cfg_add_file_callback(guest_info->fw_cfg, ACPI_BUILD_RSDP_FILE, > + fw_cfg_add_file_callback(pcms->fw_cfg, ACPI_BUILD_RSDP_FILE, > acpi_build_update, build_state, > build_state->rsdp, rsdp_size); > build_state->rsdp_mr = NULL; > diff --git a/hw/i386/pc.c b/hw/i386/pc.c > index 02d0e19..6d8ea76 100644 > --- a/hw/i386/pc.c > +++ b/hw/i386/pc.c > @@ -1171,10 +1171,10 @@ void pc_machine_done(Notifier *notifier, void *data) > extra_hosts++; > } > } > - if (extra_hosts && pcms->acpi_guest_info.fw_cfg) { > + if (extra_hosts && pcms->fw_cfg) { > uint64_t *val = g_malloc(sizeof(*val)); > *val = cpu_to_le64(extra_hosts); > - fw_cfg_add_file(pcms->acpi_guest_info.fw_cfg, > + fw_cfg_add_file(pcms->fw_cfg, > "etc/extra-pci-roots", val, sizeof(*val)); > } > } > @@ -1257,7 +1257,6 @@ void xen_load_linux(PCMachineState *pcms) > { > int i; > FWCfgState *fw_cfg; > - PcGuestInfo *guest_info = &pcms->acpi_guest_info; > > assert(MACHINE(pcms)->kernel_filename != NULL); > > @@ -1270,7 +1269,7 @@ void xen_load_linux(PCMachineState *pcms) > !strcmp(option_rom[i].name, "multiboot.bin")); > rom_add_option(option_rom[i].name, option_rom[i].bootindex); > } > - guest_info->fw_cfg = fw_cfg; > + pcms->fw_cfg = fw_cfg; > } > > void pc_memory_init(PCMachineState *pcms, > @@ -1278,7 +1277,6 @@ void pc_memory_init(PCMachineState *pcms, > MemoryRegion *rom_memory, > MemoryRegion **ram_memory) > { > - PcGuestInfo *guest_info = &pcms->acpi_guest_info; > int linux_boot, i; > MemoryRegion *ram, *option_rom_mr; > MemoryRegion *ram_below_4g, *ram_above_4g; > @@ -1399,7 +1397,7 @@ void pc_memory_init(PCMachineState *pcms, > for (i = 0; i < nb_option_roms; i++) { > rom_add_option(option_rom[i].name, option_rom[i].bootindex); > } > - guest_info->fw_cfg = fw_cfg; > + pcms->fw_cfg = fw_cfg; > } > > qemu_irq pc_allocate_cpu_irq(void) > diff --git a/include/hw/i386/pc.h b/include/hw/i386/pc.h > index 20a425c..a80adc6 100644 > --- a/include/hw/i386/pc.h > +++ b/include/hw/i386/pc.h > @@ -27,7 +27,6 @@ struct PcGuestInfo { > uint64_t numa_nodes; > uint64_t *node_mem; > uint64_t *node_cpu; > - FWCfgState *fw_cfg; > }; > > /** > @@ -49,6 +48,7 @@ struct PCMachineState { > HotplugHandler *acpi_dev; > ISADevice *rtc; > PCIBus *bus; > + FWCfgState *fw_cfg; > > /* Configuration options: */ > uint64_t max_ram_below_4g; > Looks OK to me. Reviewed-by: Marcel Apfelbaum