[v2,15/20] hw/i386/pc: Let pc_build_smbios() take a generic MachineState argument
diff mbox series

Message ID 20190613143446.23937-16-philmd@redhat.com
State New
Headers show
  • hw/i386/pc: Do not restrict the fw_cfg functions to the PC machine
Related show

Commit Message

Philippe Mathieu-Daudé June 13, 2019, 2:34 p.m. UTC
Let the pc_build_smbios() function take a generic MachineState

Suggested-by: Samuel Ortiz <sameo@linux.intel.com>
Signed-off-by: Philippe Mathieu-Daudé <philmd@redhat.com>
 hw/i386/pc.c | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff mbox series

diff --git a/hw/i386/pc.c b/hw/i386/pc.c
index c08869b52c..d3de03e5e3 100644
--- a/hw/i386/pc.c
+++ b/hw/i386/pc.c
@@ -890,13 +890,12 @@  static uint32_t x86_cpu_apic_id_from_index(unsigned int cpu_index)
-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 */
@@ -1593,7 +1592,7 @@  void pc_machine_done(Notifier *notifier, void *data)
     if (pcms->fw_cfg) {
-        pc_build_smbios(pcms, pcms->fw_cfg);
+        pc_build_smbios(MACHINE(pcms), pcms->fw_cfg);
         /* 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);