From: Philippe Mathieu-Daudé Date: Sun, 18 Aug 2019 22:54:09 +0000 (+0200) Subject: hw/i386/pc: Let pc_build_smbios() take a generic MachineState argument X-Git-Tag: v4.2.0-rc0~105^2~5 X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=f16f6f05a0c5a59c27a9427b38f615b39bc89f8a;p=thirdparty%2Fqemu.git hw/i386/pc: Let pc_build_smbios() take a generic MachineState argument Let the pc_build_smbios() function take a generic MachineState argument. Suggested-by: Samuel Ortiz Signed-off-by: Philippe Mathieu-Daudé Message-Id: <20190818225414.22590-11-philmd@redhat.com> Signed-off-by: Paolo Bonzini --- diff --git a/hw/i386/pc.c b/hw/i386/pc.c index 612d6768d6c..14ad611b536 100644 --- a/hw/i386/pc.c +++ b/hw/i386/pc.c @@ -894,13 +894,12 @@ static uint32_t x86_cpu_apic_id_from_index(PCMachineState *pcms, } } -static void pc_build_smbios(PCMachineState *pcms, FWCfgState *fw_cfg) +static void pc_build_smbios(MachineState *ms, FWCfgState *fw_cfg) { uint8_t *smbios_tables, *smbios_anchor; size_t smbios_tables_len, smbios_anchor_len; struct smbios_phys_mem_area *mem_array; unsigned i, array_count; - MachineState *ms = MACHINE(pcms); X86CPU *cpu = X86_CPU(ms->possible_cpus->cpus[0].cpu); /* tell smbios about cpuid version and features */ @@ -1695,7 +1694,7 @@ void pc_machine_done(Notifier *notifier, void *data) acpi_setup(); if (pcms->fw_cfg) { - pc_build_smbios(pcms, pcms->fw_cfg); + pc_build_smbios(MACHINE(pcms), pcms->fw_cfg); pc_build_feature_control_file(pcms); /* update FW_CFG_NB_CPUS to account for -device added CPUs */ fw_cfg_modify_i16(pcms->fw_cfg, FW_CFG_NB_CPUS, pcms->boot_cpus);