hw/arm/virt: explicitly allocate cpu_index for cpus
Currently cpu_index is implicitly auto assigned during cpu.realize() time cpu_exec_realizefn()->cpu_list_add(). It happens to match index in possible_cpus so take control over it and make board initialize cpu_index to possible_cpus index explicitly. It will at least document that board is in control of it and when '-device cpu' support comes it will keep cpu_index stable regardless of order cpus are created so it won't break migration. Within this series it will be used for internal conversion from storing cpu_index based NUMA node bitmaps to property based mapping with possible_cpus, And will allow map cpu_index to a CPU entry in possible_cpus array. Signed-off-by: Igor Mammedov <imammedo@redhat.com> Reviewed-by: Andrew Jones <drjones@redhat.com> Message-Id: <1493816238-33120-5-git-send-email-imammedo@redhat.com> Signed-off-by: Eduardo Habkost <ehabkost@redhat.com>
This commit is contained in:
parent
17d3d0e2d9
commit
d9c34f9c6c
|
@ -1349,6 +1349,7 @@ static void machvirt_init(MachineState *machine)
|
||||||
possible_cpus = mc->possible_cpu_arch_ids(machine);
|
possible_cpus = mc->possible_cpu_arch_ids(machine);
|
||||||
for (n = 0; n < possible_cpus->len; n++) {
|
for (n = 0; n < possible_cpus->len; n++) {
|
||||||
Object *cpuobj;
|
Object *cpuobj;
|
||||||
|
CPUState *cs;
|
||||||
|
|
||||||
if (n >= smp_cpus) {
|
if (n >= smp_cpus) {
|
||||||
break;
|
break;
|
||||||
|
@ -1358,6 +1359,9 @@ static void machvirt_init(MachineState *machine)
|
||||||
object_property_set_int(cpuobj, possible_cpus->cpus[n].arch_id,
|
object_property_set_int(cpuobj, possible_cpus->cpus[n].arch_id,
|
||||||
"mp-affinity", NULL);
|
"mp-affinity", NULL);
|
||||||
|
|
||||||
|
cs = CPU(cpuobj);
|
||||||
|
cs->cpu_index = n;
|
||||||
|
|
||||||
if (!vms->secure) {
|
if (!vms->secure) {
|
||||||
object_property_set_bool(cpuobj, false, "has_el3", NULL);
|
object_property_set_bool(cpuobj, false, "has_el3", NULL);
|
||||||
}
|
}
|
||||||
|
|
Loading…
Reference in a new issue