david.venhoff/QEMU-Nyx-fork
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

hw/i386/pc: Pass the CPUArchIdList array by argument

Browse Source 
Pass the CPUArchIdList array 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-8-philmd@redhat.com>
Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
This commit is contained in:
Philippe Mathieu-Daudé 2019-08-19 00:54:06 +02:00 committed by Paolo Bonzini
parent 57e23e7837
commit 264b485776
1 changed files with 9 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
hw/i386/pc.c
View File

@ -937,14 +937,13 @@ static void pc_build_smbios(PCMachineState *pcms)
} }
static FWCfgState *fw_cfg_arch_create(PCMachineState *pcms, static FWCfgState *fw_cfg_arch_create(PCMachineState *pcms,
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;
const CPUArchIdList *cpus;
MachineClass *mc = MACHINE_GET_CLASS(pcms);
MachineState *ms = MACHINE(pcms); MachineState *ms = MACHINE(pcms);
int nb_numa_nodes = ms->numa_state->num_nodes; int nb_numa_nodes = ms->numa_state->num_nodes;
@ -964,7 +963,7 @@ static FWCfgState *fw_cfg_arch_create(PCMachineState *pcms,
* So for compatibility reasons with old BIOSes we are stuck with * So for compatibility reasons with old BIOSes we are stuck with
* "etc/max-cpus" actually being apic_id_limit * "etc/max-cpus" actually being apic_id_limit
*/ */
fw_cfg_add_i16(fw_cfg, FW_CFG_MAX_CPUS, (uint16_t)pcms->apic_id_limit); fw_cfg_add_i16(fw_cfg, FW_CFG_MAX_CPUS, apic_id_limit);
fw_cfg_add_i64(fw_cfg, FW_CFG_RAM_SIZE, (uint64_t)ram_size); fw_cfg_add_i64(fw_cfg, FW_CFG_RAM_SIZE, (uint64_t)ram_size);
fw_cfg_add_bytes(fw_cfg, FW_CFG_ACPI_TABLES, fw_cfg_add_bytes(fw_cfg, FW_CFG_ACPI_TABLES,
acpi_tables, acpi_tables_len); acpi_tables, acpi_tables_len);
@ -980,20 +979,19 @@ static FWCfgState *fw_cfg_arch_create(PCMachineState *pcms,
* of nodes, one word for each VCPU->node and one word for each node to * of nodes, one word for each VCPU->node and one word for each node to
* hold the amount of memory. * hold the amount of memory.
*/ */
numa_fw_cfg = g_new0(uint64_t, 1 + pcms->apic_id_limit + nb_numa_nodes); numa_fw_cfg = g_new0(uint64_t, 1 + apic_id_limit + nb_numa_nodes);
numa_fw_cfg[0] = cpu_to_le64(nb_numa_nodes); numa_fw_cfg[0] = cpu_to_le64(nb_numa_nodes);
cpus = mc->possible_cpu_arch_ids(MACHINE(pcms));
for (i = 0; i < cpus->len; i++) { for (i = 0; i < cpus->len; i++) {
unsigned int apic_id = cpus->cpus[i].arch_id; unsigned int apic_id = cpus->cpus[i].arch_id;
assert(apic_id < pcms->apic_id_limit); assert(apic_id < apic_id_limit);
numa_fw_cfg[apic_id + 1] = cpu_to_le64(cpus->cpus[i].props.node_id); numa_fw_cfg[apic_id + 1] = cpu_to_le64(cpus->cpus[i].props.node_id);
} }
for (i = 0; i < nb_numa_nodes; i++) { for (i = 0; i < nb_numa_nodes; i++) {
numa_fw_cfg[pcms->apic_id_limit + 1 + i] = numa_fw_cfg[apic_id_limit + 1 + i] =
cpu_to_le64(ms->numa_state->nodes[i].node_mem); cpu_to_le64(ms->numa_state->nodes[i].node_mem);
} }
fw_cfg_add_bytes(fw_cfg, FW_CFG_NUMA, numa_fw_cfg, fw_cfg_add_bytes(fw_cfg, FW_CFG_NUMA, numa_fw_cfg,
(1 + pcms->apic_id_limit + nb_numa_nodes) * (1 + apic_id_limit + nb_numa_nodes) *
sizeof(*numa_fw_cfg)); sizeof(*numa_fw_cfg));
return fw_cfg; return fw_cfg;
@ -1775,6 +1773,7 @@ void pc_memory_init(PCMachineState *pcms,
MemoryRegion *ram_below_4g, *ram_above_4g; MemoryRegion *ram_below_4g, *ram_above_4g;
FWCfgState *fw_cfg; FWCfgState *fw_cfg;
MachineState *machine = MACHINE(pcms); MachineState *machine = MACHINE(pcms);
MachineClass *mc = MACHINE_GET_CLASS(machine);
PCMachineClass *pcmc = PC_MACHINE_GET_CLASS(pcms); PCMachineClass *pcmc = PC_MACHINE_GET_CLASS(pcms);
assert(machine->ram_size == pcms->below_4g_mem_size + assert(machine->ram_size == pcms->below_4g_mem_size +
@ -1808,7 +1807,6 @@ void pc_memory_init(PCMachineState *pcms,
if (!pcmc->has_reserved_memory && if (!pcmc->has_reserved_memory &&
(machine->ram_slots || (machine->ram_slots ||
(machine->maxram_size > machine->ram_size))) { (machine->maxram_size > machine->ram_size))) {
MachineClass *mc = MACHINE_GET_CLASS(machine);
error_report("\"-memory 'slots|maxmem'\" is not supported by: %s", error_report("\"-memory 'slots|maxmem'\" is not supported by: %s",
mc->name); mc->name);
@ -1871,7 +1869,8 @@ void pc_memory_init(PCMachineState *pcms,
option_rom_mr, option_rom_mr,
1); 1);
fw_cfg = fw_cfg_arch_create(pcms, pcms->boot_cpus, pcms->apic_id_limit); fw_cfg = fw_cfg_arch_create(pcms, mc->possible_cpu_arch_ids(machine),
pcms->boot_cpus, pcms->apic_id_limit);
rom_set_fw(fw_cfg); rom_set_fw(fw_cfg);