aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPhilippe Mathieu-Daudé <philmd@redhat.com>2019-08-19 00:54:04 +0200
committerPaolo Bonzini <pbonzini@redhat.com>2019-09-16 17:13:07 +0200
commit524acbe97dcaf7e397d75e2d6eee3b0aaabd0b38 (patch)
tree83ec2d3da3adc7f329f486735f43e0804567ff65
parent5888e01cfdf5044d6f43bb5c6be9e3d80bcb6ea7 (diff)
hw/i386/pc: Pass the boot_cpus value by argument
The boot_cpus is used once. Pass it by argument, this will allow us to remove the PCMachineState argument later. Suggested-by: Samuel Ortiz <sameo@linux.intel.com> Signed-off-by: Philippe Mathieu-Daudé <philmd@redhat.com> Message-Id: <20190818225414.22590-6-philmd@redhat.com> Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
-rw-r--r--hw/i386/pc.c7
1 files changed, 4 insertions, 3 deletions
diff --git a/hw/i386/pc.c b/hw/i386/pc.c
index b15af77a9f..dc2ae6d5cf 100644
--- a/hw/i386/pc.c
+++ b/hw/i386/pc.c
@@ -936,7 +936,8 @@ static void pc_build_smbios(PCMachineState *pcms)
}
}
-static FWCfgState *fw_cfg_arch_create(PCMachineState *pcms)
+static FWCfgState *fw_cfg_arch_create(PCMachineState *pcms,
+ uint16_t boot_cpus)
{
FWCfgState *fw_cfg;
uint64_t *numa_fw_cfg;
@@ -948,7 +949,7 @@ static FWCfgState *fw_cfg_arch_create(PCMachineState *pcms)
fw_cfg = fw_cfg_init_io_dma(FW_CFG_IO_BASE, FW_CFG_IO_BASE + 4,
&address_space_memory);
- fw_cfg_add_i16(fw_cfg, FW_CFG_NB_CPUS, pcms->boot_cpus);
+ fw_cfg_add_i16(fw_cfg, FW_CFG_NB_CPUS, boot_cpus);
/* FW_CFG_MAX_CPUS is a bit confusing/problematic on x86:
*
@@ -1869,7 +1870,7 @@ void pc_memory_init(PCMachineState *pcms,
option_rom_mr,
1);
- fw_cfg = fw_cfg_arch_create(pcms);
+ fw_cfg = fw_cfg_arch_create(pcms, pcms->boot_cpus);
rom_set_fw(fw_cfg);