We removed the PCMachineState access, we can now let the fw_cfg_init()
function to take a generic MachineState object.
Suggested-by: Samuel Ortiz <sa...@linux.intel.com>
Signed-off-by: Philippe Mathieu-Daudé <phi...@redhat.com>
---
hw/i386/pc.c | 5 +++--
1 file changed, 3 insertions(+), 2 deletions(-)
diff --git a/hw/i386/pc.c b/hw/i386/pc.c
index 6cfdb09f34..e8813ef2b6 100644
--- a/hw/i386/pc.c
+++ b/hw/i386/pc.c
@@ -928,7 +928,7 @@ static void pc_build_smbios(PCMachineState *pcms)
}
}
-static FWCfgState *x86_create_fw_cfg(PCMachineState *pcms, const CPUArchIdList
*cpus,
+static FWCfgState *x86_create_fw_cfg(MachineState *ms, const CPUArchIdList
*cpus,
uint16_t boot_cpus, uint16_t
apic_id_limit)
{
FWCfgState *fw_cfg;
@@ -1664,6 +1664,7 @@ void pc_memory_init(PCMachineState *pcms,
MemoryRegion *ram_below_4g, *ram_above_4g;
FWCfgState *fw_cfg;
MachineState *machine = MACHINE(pcms);
+ MachineClass *mc = MACHINE_GET_CLASS(machine);
PCMachineClass *pcmc = PC_MACHINE_GET_CLASS(pcms);
assert(machine->ram_size == pcms->below_4g_mem_size +
@@ -1760,7 +1761,7 @@ void pc_memory_init(PCMachineState *pcms,
option_rom_mr,
1);
- fw_cfg = x86_create_fw_cfg(pcms, mc->possible_cpu_arch_ids(machine),
+ fw_cfg = x86_create_fw_cfg(machine, mc->possible_cpu_arch_ids(machine),
pcms->boot_cpus, pcms->apic_id_limit);
rom_set_fw(fw_cfg);
--
2.20.1
