@@ -1029,23 +1029,6 @@ static void pc_fw_cfg_guest_info(PcGuestInfo *guest_info)
fw_cfg_add_file(guest_info->fw_cfg, "etc/pci-info", info, sizeof *info);
}
-static void pc_set_cpu_guest_info(CPUState *cpu, PcGuestInfo *guest_info)
-{
- CPUClass *klass = CPU_GET_CLASS(cpu);
- uint64_t apic_id = klass->get_arch_id(cpu);
- int j;
-
- assert(apic_id < guest_info->apic_id_limit);
-
- for (j = 0; j < guest_info->numa_nodes; j++) {
- assert(cpu->cpu_index < max_cpus);
- if (test_bit(cpu->cpu_index, node_cpumask[j])) {
- guest_info->node_cpu[apic_id] = cpu_to_le64(j);
- break;
- }
- }
-}
-
typedef struct PcGuestInfoState {
PcGuestInfo info;
Notifier machine_done;
@@ -1066,7 +1049,7 @@ PcGuestInfo *pc_guest_info_init(ram_addr_t below_4g_mem_size,
{
PcGuestInfoState *guest_info_state = g_malloc0(sizeof *guest_info_state);
PcGuestInfo *guest_info = &guest_info_state->info;
- CPUState *cpu;
+ int i, j;
guest_info->ram_size = below_4g_mem_size + above_4g_mem_size;
guest_info->apic_id_limit = pc_apic_id_limit(max_cpus);
@@ -1077,8 +1060,15 @@ PcGuestInfo *pc_guest_info_init(ram_addr_t below_4g_mem_size,
guest_info->node_cpu = g_malloc0(guest_info->apic_id_limit *
sizeof *guest_info->node_cpu);
- CPU_FOREACH(cpu) {
- pc_set_cpu_guest_info(cpu, guest_info);
+ for (i = 0; i < max_cpus; i++) {
+ unsigned int apic_id = x86_cpu_apic_id_from_index(i);
+ assert(apic_id < guest_info->apic_id_limit);
+ for (j = 0; j < nb_numa_nodes; j++) {
+ if (test_bit(i, node_cpumask[j])) {
+ guest_info->node_cpu[apic_id] = j;
+ break;
+ }
+ }
}
guest_info_state->machine_done.notify = pc_guest_info_machine_done;