mirrors/qemu
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

hw/i386/pc: Pass the boot_cpus value by argument

Browse Source 
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>
This commit is contained in:
Philippe Mathieu-Daudé 2019-08-19 00:54:04 +02:00 committed by Paolo Bonzini
parent 5888e01cfd
commit 524acbe97d
1 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
hw/i386/pc.c
View File

@ -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; FWCfgState *fw_cfg;
uint64_t *numa_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, fw_cfg = fw_cfg_init_io_dma(FW_CFG_IO_BASE, FW_CFG_IO_BASE + 4,
&address_space_memory); &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: /* FW_CFG_MAX_CPUS is a bit confusing/problematic on x86:
* *
@ -1869,7 +1870,7 @@ void pc_memory_init(PCMachineState *pcms,
option_rom_mr, option_rom_mr,
1); 1);
fw_cfg = fw_cfg_arch_create(pcms); fw_cfg = fw_cfg_arch_create(pcms, pcms->boot_cpus);
rom_set_fw(fw_cfg); rom_set_fw(fw_cfg);