ShuriZma
/
xemu
mirror of https://github.com/xemu-project/xemu.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

machine: move possible_cpus to MachineState 

so that it would be possible to reuse it with
spapr/virt-aarch64 targets.

Signed-off-by: Igor Mammedov <imammedo@redhat.com>
Signed-off-by: David Gibson <david@gibson.dropbear.id.au>
This commit is contained in:
Igor Mammedov 2017-02-09 12:08:32 +01:00 committed by David Gibson
parent fb38ebfbfe
commit 38690a1ca7
3 changed files with 30 additions and 29 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

57
hw/i386/pc.c
View File

@ -707,7 +707,8 @@ static void pc_build_smbios(PCMachineState *pcms)
size_t smbios_tables_len, smbios_anchor_len; size_t smbios_tables_len, smbios_anchor_len;
struct smbios_phys_mem_area *mem_array; struct smbios_phys_mem_area *mem_array;
unsigned i, array_count; unsigned i, array_count;
X86CPU *cpu = X86_CPU(pcms->possible_cpus->cpus[0].cpu); MachineState *ms = MACHINE(pcms);
X86CPU *cpu = X86_CPU(ms->possible_cpus->cpus[0].cpu);
/* tell smbios about cpuid version and features */ /* tell smbios about cpuid version and features */
smbios_set_cpuid(cpu->env.cpuid_version, cpu->env.features[FEAT_1_EDX]); smbios_set_cpuid(cpu->env.cpuid_version, cpu->env.features[FEAT_1_EDX]);
@ -1111,7 +1112,7 @@ static void pc_new_cpu(const char *typename, int64_t apic_id, Error **errp)
void pc_hot_add_cpu(const int64_t id, Error **errp) void pc_hot_add_cpu(const int64_t id, Error **errp)
{ {
ObjectClass *oc; ObjectClass *oc;
PCMachineState *pcms = PC_MACHINE(qdev_get_machine()); MachineState *ms = MACHINE(qdev_get_machine());
int64_t apic_id = x86_cpu_apic_id_from_index(id); int64_t apic_id = x86_cpu_apic_id_from_index(id);
Error *local_err = NULL; Error *local_err = NULL;
@ -1127,8 +1128,8 @@ void pc_hot_add_cpu(const int64_t id, Error **errp)
return; return;
} }
assert(pcms->possible_cpus->cpus[0].cpu); /* BSP is always present */ assert(ms->possible_cpus->cpus[0].cpu); /* BSP is always present */
oc = OBJECT_CLASS(CPU_GET_CLASS(pcms->possible_cpus->cpus[0].cpu)); oc = OBJECT_CLASS(CPU_GET_CLASS(ms->possible_cpus->cpus[0].cpu));
pc_new_cpu(object_class_get_name(oc), apic_id, &local_err); pc_new_cpu(object_class_get_name(oc), apic_id, &local_err);
if (local_err) { if (local_err) {
error_propagate(errp, local_err); error_propagate(errp, local_err);
@ -1178,11 +1179,11 @@ void pc_cpus_init(PCMachineState *pcms)
* This is used for FW_CFG_MAX_CPUS. See comments on bochs_bios_init(). * This is used for FW_CFG_MAX_CPUS. See comments on bochs_bios_init().
*/ */
pcms->apic_id_limit = x86_cpu_apic_id_from_index(max_cpus - 1) + 1; pcms->apic_id_limit = x86_cpu_apic_id_from_index(max_cpus - 1) + 1;
pcms->possible_cpus = g_malloc0(sizeof(CPUArchIdList) + machine->possible_cpus = g_malloc0(sizeof(CPUArchIdList) +
sizeof(CPUArchId) * max_cpus); sizeof(CPUArchId) * max_cpus);
for (i = 0; i < max_cpus; i++) { for (i = 0; i < max_cpus; i++) {
pcms->possible_cpus->cpus[i].arch_id = x86_cpu_apic_id_from_index(i); machine->possible_cpus->cpus[i].arch_id = x86_cpu_apic_id_from_index(i);
pcms->possible_cpus->len++; machine->possible_cpus->len++;
if (i < smp_cpus) { if (i < smp_cpus) {
pc_new_cpu(typename, x86_cpu_apic_id_from_index(i), &error_fatal); pc_new_cpu(typename, x86_cpu_apic_id_from_index(i), &error_fatal);
} }
@ -1191,7 +1192,8 @@ void pc_cpus_init(PCMachineState *pcms)
static void pc_build_feature_control_file(PCMachineState *pcms) static void pc_build_feature_control_file(PCMachineState *pcms)
{ {
X86CPU *cpu = X86_CPU(pcms->possible_cpus->cpus[0].cpu); MachineState *ms = MACHINE(pcms);
X86CPU *cpu = X86_CPU(ms->possible_cpus->cpus[0].cpu);
CPUX86State *env = &cpu->env; CPUX86State *env = &cpu->env;
uint32_t unused, ecx, edx; uint32_t unused, ecx, edx;
uint64_t feature_control_bits = 0; uint64_t feature_control_bits = 0;
@ -1787,21 +1789,20 @@ static int pc_apic_cmp(const void *a, const void *b)
} }
/* returns pointer to CPUArchId descriptor that matches CPU's apic_id /* returns pointer to CPUArchId descriptor that matches CPU's apic_id
* in pcms->possible_cpus->cpus, if pcms->possible_cpus->cpus has no * in ms->possible_cpus->cpus, if ms->possible_cpus->cpus has no
* entry corresponding to CPU's apic_id returns NULL. * entry corresponding to CPU's apic_id returns NULL.
*/ */
static CPUArchId *pc_find_cpu_slot(PCMachineState *pcms, CPUState *cpu, static CPUArchId *pc_find_cpu_slot(MachineState *ms, CPUState *cpu, int *idx)
int *idx)
{ {
CPUClass *cc = CPU_GET_CLASS(cpu); CPUClass *cc = CPU_GET_CLASS(cpu);
CPUArchId apic_id, *found_cpu; CPUArchId apic_id, *found_cpu;
apic_id.arch_id = cc->get_arch_id(CPU(cpu)); apic_id.arch_id = cc->get_arch_id(CPU(cpu));
found_cpu = bsearch(&apic_id, pcms->possible_cpus->cpus, found_cpu = bsearch(&apic_id, ms->possible_cpus->cpus,
pcms->possible_cpus->len, sizeof(*pcms->possible_cpus->cpus), ms->possible_cpus->len, sizeof(*ms->possible_cpus->cpus),
pc_apic_cmp); pc_apic_cmp);
if (found_cpu && idx) { if (found_cpu && idx) {
*idx = found_cpu - pcms->possible_cpus->cpus; *idx = found_cpu - ms->possible_cpus->cpus;
} }
return found_cpu; return found_cpu;
} }
@ -1831,7 +1832,7 @@ static void pc_cpu_plug(HotplugHandler *hotplug_dev,
fw_cfg_modify_i16(pcms->fw_cfg, FW_CFG_NB_CPUS, pcms->boot_cpus); fw_cfg_modify_i16(pcms->fw_cfg, FW_CFG_NB_CPUS, pcms->boot_cpus);
} }
found_cpu = pc_find_cpu_slot(pcms, CPU(dev), NULL); found_cpu = pc_find_cpu_slot(MACHINE(pcms), CPU(dev), NULL);
found_cpu->cpu = CPU(dev); found_cpu->cpu = CPU(dev);
out: out:
error_propagate(errp, local_err); error_propagate(errp, local_err);
@ -1844,7 +1845,7 @@ static void pc_cpu_unplug_request_cb(HotplugHandler *hotplug_dev,
Error *local_err = NULL; Error *local_err = NULL;
PCMachineState *pcms = PC_MACHINE(hotplug_dev); PCMachineState *pcms = PC_MACHINE(hotplug_dev);
pc_find_cpu_slot(pcms, CPU(dev), &idx); pc_find_cpu_slot(MACHINE(pcms), CPU(dev), &idx);
assert(idx != -1); assert(idx != -1);
if (idx == 0) { if (idx == 0) {
error_setg(&local_err, "Boot CPU is unpluggable"); error_setg(&local_err, "Boot CPU is unpluggable");
@ -1878,7 +1879,7 @@ static void pc_cpu_unplug_cb(HotplugHandler *hotplug_dev,
goto out; goto out;
} }
found_cpu = pc_find_cpu_slot(pcms, CPU(dev), NULL); found_cpu = pc_find_cpu_slot(MACHINE(pcms), CPU(dev), NULL);
found_cpu->cpu = NULL; found_cpu->cpu = NULL;
object_unparent(OBJECT(dev)); object_unparent(OBJECT(dev));
@ -1936,13 +1937,15 @@ static void pc_cpu_pre_plug(HotplugHandler *hotplug_dev,
cpu->apic_id = apicid_from_topo_ids(smp_cores, smp_threads, &topo); cpu->apic_id = apicid_from_topo_ids(smp_cores, smp_threads, &topo);
} }
cpu_slot = pc_find_cpu_slot(pcms, CPU(dev), &idx); cpu_slot = pc_find_cpu_slot(MACHINE(pcms), CPU(dev), &idx);
if (!cpu_slot) { if (!cpu_slot) {
MachineState *ms = MACHINE(pcms);
x86_topo_ids_from_apicid(cpu->apic_id, smp_cores, smp_threads, &topo); x86_topo_ids_from_apicid(cpu->apic_id, smp_cores, smp_threads, &topo);
error_setg(errp, "Invalid CPU [socket: %u, core: %u, thread: %u] with" error_setg(errp, "Invalid CPU [socket: %u, core: %u, thread: %u] with"
" APIC ID %" PRIu32 ", valid index range 0:%d", " APIC ID %" PRIu32 ", valid index range 0:%d",
topo.pkg_id, topo.core_id, topo.smt_id, cpu->apic_id, topo.pkg_id, topo.core_id, topo.smt_id, cpu->apic_id,
pcms->possible_cpus->len - 1); ms->possible_cpus->len - 1);
return; return;
} }
@ -2253,9 +2256,8 @@ static unsigned pc_cpu_index_to_socket_id(unsigned cpu_index)
static const CPUArchIdList *pc_possible_cpu_arch_ids(MachineState *machine) static const CPUArchIdList *pc_possible_cpu_arch_ids(MachineState *machine)
{ {
PCMachineState *pcms = PC_MACHINE(machine); assert(machine->possible_cpus);
assert(pcms->possible_cpus); return machine->possible_cpus;
return pcms->possible_cpus;
} }
static HotpluggableCPUList *pc_query_hotpluggable_cpus(MachineState *machine) static HotpluggableCPUList *pc_query_hotpluggable_cpus(MachineState *machine)
@ -2263,19 +2265,18 @@ static HotpluggableCPUList *pc_query_hotpluggable_cpus(MachineState *machine)
int i; int i;
CPUState *cpu; CPUState *cpu;
HotpluggableCPUList *head = NULL; HotpluggableCPUList *head = NULL;
PCMachineState *pcms = PC_MACHINE(machine);
const char *cpu_type; const char *cpu_type;
cpu = pcms->possible_cpus->cpus[0].cpu; cpu = machine->possible_cpus->cpus[0].cpu;
assert(cpu); /* BSP is always present */ assert(cpu); /* BSP is always present */
cpu_type = object_class_get_name(OBJECT_CLASS(CPU_GET_CLASS(cpu))); cpu_type = object_class_get_name(OBJECT_CLASS(CPU_GET_CLASS(cpu)));
for (i = 0; i < pcms->possible_cpus->len; i++) { for (i = 0; i < machine->possible_cpus->len; i++) {
X86CPUTopoInfo topo; X86CPUTopoInfo topo;
HotpluggableCPUList *list_item = g_new0(typeof(*list_item), 1); HotpluggableCPUList *list_item = g_new0(typeof(*list_item), 1);
HotpluggableCPU *cpu_item = g_new0(typeof(*cpu_item), 1); HotpluggableCPU *cpu_item = g_new0(typeof(*cpu_item), 1);
CpuInstanceProperties *cpu_props = g_new0(typeof(*cpu_props), 1); CpuInstanceProperties *cpu_props = g_new0(typeof(*cpu_props), 1);
const uint32_t apic_id = pcms->possible_cpus->cpus[i].arch_id; const uint32_t apic_id = machine->possible_cpus->cpus[i].arch_id;
x86_topo_ids_from_apicid(apic_id, smp_cores, smp_threads, &topo); x86_topo_ids_from_apicid(apic_id, smp_cores, smp_threads, &topo);
@ -2289,7 +2290,7 @@ static HotpluggableCPUList *pc_query_hotpluggable_cpus(MachineState *machine)
cpu_props->thread_id = topo.smt_id; cpu_props->thread_id = topo.smt_id;
cpu_item->props = cpu_props; cpu_item->props = cpu_props;
cpu = pcms->possible_cpus->cpus[i].cpu; cpu = machine->possible_cpus->cpus[i].cpu;
if (cpu) { if (cpu) {
cpu_item->has_qom_path = true; cpu_item->has_qom_path = true;
cpu_item->qom_path = object_get_canonical_path(OBJECT(cpu)); cpu_item->qom_path = object_get_canonical_path(OBJECT(cpu));

1
include/hw/boards.h
View File

@ -178,6 +178,7 @@ struct MachineState {
char *initrd_filename; char *initrd_filename;
const char *cpu_model; const char *cpu_model;
AccelState *accelerator; AccelState *accelerator;
CPUArchIdList *possible_cpus;
}; };
#define DEFINE_MACHINE(namestr, machine_initfn) \ #define DEFINE_MACHINE(namestr, machine_initfn) \

1
include/hw/i386/pc.h
View File

@ -73,7 +73,6 @@ struct PCMachineState {
/* CPU and apic information: */ /* CPU and apic information: */
bool apic_xrupt_override; bool apic_xrupt_override;
unsigned apic_id_limit; unsigned apic_id_limit;
CPUArchIdList *possible_cpus;
uint16_t boot_cpus; uint16_t boot_cpus;
/* NUMA information: */ /* NUMA information: */