Pass the apic_id_limit value by argument, this will allow us to remove the PCMachineState argument later.
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 01894b9875..fe07baeb1d 100644 --- a/hw/i386/pc.c +++ b/hw/i386/pc.c @@ -928,7 +928,8 @@ static void pc_build_smbios(PCMachineState *pcms) } } -static FWCfgState *x86_create_fw_cfg(PCMachineState *pcms, uint16_t boot_cpus) +static FWCfgState *x86_create_fw_cfg(PCMachineState *pcms, + uint16_t boot_cpus, uint16_t apic_id_limit) { FWCfgState *fw_cfg; uint64_t *numa_fw_cfg; @@ -1762,7 +1763,7 @@ void pc_memory_init(PCMachineState *pcms, option_rom_mr, 1); - fw_cfg = x86_create_fw_cfg(pcms, pcms->boot_cpus); + fw_cfg = x86_create_fw_cfg(pcms, pcms->boot_cpus, pcms->apic_id_limit); rom_set_fw(fw_cfg); -- 2.20.1