[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PULL 21/29] hw/i386/pc: Pass the CPUArchIdList array by ar
From: |
Paolo Bonzini |
Subject: |
[Qemu-devel] [PULL 21/29] hw/i386/pc: Pass the CPUArchIdList array by argument |
Date: |
Mon, 16 Sep 2019 16:42:01 +0200 |
From: Philippe Mathieu-Daudé <address@hidden>
Pass the CPUArchIdList array by argument, this will
allow us to remove the PCMachineState argument later.
Suggested-by: Samuel Ortiz <address@hidden>
Signed-off-by: Philippe Mathieu-Daudé <address@hidden>
Message-Id: <address@hidden>
---
hw/i386/pc.c | 19 +++++++++----------
1 file changed, 9 insertions(+), 10 deletions(-)
diff --git a/hw/i386/pc.c b/hw/i386/pc.c
index c0e9d83..5b3f615 100644
--- a/hw/i386/pc.c
+++ b/hw/i386/pc.c
@@ -937,14 +937,13 @@ static void pc_build_smbios(PCMachineState *pcms)
}
static FWCfgState *fw_cfg_arch_create(PCMachineState *pcms,
+ const CPUArchIdList *cpus,
uint16_t boot_cpus,
uint16_t apic_id_limit)
{
FWCfgState *fw_cfg;
uint64_t *numa_fw_cfg;
int i;
- const CPUArchIdList *cpus;
- MachineClass *mc = MACHINE_GET_CLASS(pcms);
MachineState *ms = MACHINE(pcms);
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
* "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_bytes(fw_cfg, FW_CFG_ACPI_TABLES,
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
* 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);
- cpus = mc->possible_cpu_arch_ids(MACHINE(pcms));
for (i = 0; i < cpus->len; i++) {
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);
}
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);
}
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));
return fw_cfg;
@@ -1775,6 +1773,7 @@ void pc_memory_init(PCMachineState *pcms,
MemoryRegion *ram_below_4g, *ram_above_4g;
FWCfgState *fw_cfg;
MachineState *machine = MACHINE(pcms);
+ MachineClass *mc = MACHINE_GET_CLASS(machine);
PCMachineClass *pcmc = PC_MACHINE_GET_CLASS(pcms);
assert(machine->ram_size == pcms->below_4g_mem_size +
@@ -1808,7 +1807,6 @@ void pc_memory_init(PCMachineState *pcms,
if (!pcmc->has_reserved_memory &&
(machine->ram_slots ||
(machine->maxram_size > machine->ram_size))) {
- MachineClass *mc = MACHINE_GET_CLASS(machine);
error_report("\"-memory 'slots|maxmem'\" is not supported by: %s",
mc->name);
@@ -1871,7 +1869,8 @@ void pc_memory_init(PCMachineState *pcms,
option_rom_mr,
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);
--
1.8.3.1
- [Qemu-devel] [PULL 08/29] test-char: fix AddressSanitizer failure, (continued)
- [Qemu-devel] [PULL 08/29] test-char: fix AddressSanitizer failure, Paolo Bonzini, 2019/09/16
- [Qemu-devel] [PULL 09/29] hw/i386: Move CONFIG_ACPI_PCI to CONFIG_PC, Paolo Bonzini, 2019/09/16
- [Qemu-devel] [PULL 10/29] elf-ops.h: fix int overflow in load_elf(), Paolo Bonzini, 2019/09/16
- [Qemu-devel] [PULL 12/29] memory: inline and optimize devend_memop, Paolo Bonzini, 2019/09/16
- [Qemu-devel] [PULL 11/29] memory: fetch pmem size in get_file_size(), Paolo Bonzini, 2019/09/16
- [Qemu-devel] [PULL 15/29] hw/i386/pc: Use e820_get_num_entries() to access e820_entries, Paolo Bonzini, 2019/09/16
- [Qemu-devel] [PULL 14/29] cpus: Fix throttling during vm_stop, Paolo Bonzini, 2019/09/16
- [Qemu-devel] [PULL 16/29] hw/i386/pc: Extract e820 memory layout code, Paolo Bonzini, 2019/09/16
- [Qemu-devel] [PULL 20/29] hw/i386/pc: Pass the apic_id_limit value by argument, Paolo Bonzini, 2019/09/16
- [Qemu-devel] [PULL 13/29] qemu-thread: Add qemu_cond_timedwait, Paolo Bonzini, 2019/09/16
- [Qemu-devel] [PULL 21/29] hw/i386/pc: Pass the CPUArchIdList array by argument,
Paolo Bonzini <=
- [Qemu-devel] [PULL 22/29] hw/i386/pc: Replace PCMachineState argument with MachineState in fw_cfg_arch_create, Paolo Bonzini, 2019/09/16
- [Qemu-devel] [PULL 23/29] hw/i386/pc: Let pc_build_smbios() take a FWCfgState argument, Paolo Bonzini, 2019/09/16
- [Qemu-devel] [PULL 25/29] hw/i386/pc: Rename pc_build_smbios() as generic fw_cfg_build_smbios(), Paolo Bonzini, 2019/09/16
- [Qemu-devel] [PULL 24/29] hw/i386/pc: Let pc_build_smbios() take a generic MachineState argument, Paolo Bonzini, 2019/09/16
- [Qemu-devel] [PULL 28/29] hw/i386/pc: Rename pc_build_feature_control() as generic fw_cfg_build_*, Paolo Bonzini, 2019/09/16
- [Qemu-devel] [PULL 17/29] hw/i386/pc: Use address_space_memory in place, Paolo Bonzini, 2019/09/16
- [Qemu-devel] [PULL 18/29] hw/i386/pc: Rename bochs_bios_init as more generic fw_cfg_arch_create, Paolo Bonzini, 2019/09/16
- [Qemu-devel] [PULL 19/29] hw/i386/pc: Pass the boot_cpus value by argument, Paolo Bonzini, 2019/09/16
- [Qemu-devel] [PULL 26/29] hw/i386/pc: Let pc_build_feature_control() take a FWCfgState argument, Paolo Bonzini, 2019/09/16
- [Qemu-devel] [PULL 27/29] hw/i386/pc: Let pc_build_feature_control() take a MachineState argument, Paolo Bonzini, 2019/09/16