Proxmox-Port/qemu
1
0
Fork 0
mirror of https://github.com/qemu/qemu.git synced 2025-08-14 03:15:54 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

hw/i386/pc: Replace PCMachineState argument with MachineState in fw_cfg_arch_create

Browse Source 
In the previous commit we removed the last access to PCMachineState.
Replace it with a generic MachineState argument and use it to retrieve
the CPUArchIdList.

Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
This commit is contained in:
Paolo Bonzini 2019-09-16 12:42:42 +02:00
parent 264b485776
commit bd802bd981
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
hw/i386/pc.c
View File

@ -936,15 +936,15 @@ static void pc_build_smbios(PCMachineState *pcms)
} }
} }
static FWCfgState *fw_cfg_arch_create(PCMachineState *pcms, static FWCfgState *fw_cfg_arch_create(MachineState *ms,
const CPUArchIdList *cpus,
uint16_t boot_cpus, uint16_t boot_cpus,
uint16_t apic_id_limit) uint16_t apic_id_limit)
{ {
FWCfgState *fw_cfg; FWCfgState *fw_cfg;
uint64_t *numa_fw_cfg; uint64_t *numa_fw_cfg;
int i; int i;
MachineState *ms = MACHINE(pcms); MachineClass *mc = MACHINE_GET_CLASS(ms);
const CPUArchIdList *cpus = mc->possible_cpu_arch_ids(ms);
int nb_numa_nodes = ms->numa_state->num_nodes; int nb_numa_nodes = ms->numa_state->num_nodes;
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,
@ -1869,7 +1869,7 @@ void pc_memory_init(PCMachineState *pcms,
option_rom_mr, option_rom_mr,
1); 1);
fw_cfg = fw_cfg_arch_create(pcms, mc->possible_cpu_arch_ids(machine), fw_cfg = fw_cfg_arch_create(machine,
pcms->boot_cpus, pcms->apic_id_limit); pcms->boot_cpus, pcms->apic_id_limit);
rom_set_fw(fw_cfg); rom_set_fw(fw_cfg);