| Message ID | 1490189568-167621-5-git-send-email-imammedo@redhat.com |
|---|---|
| State | New |
| Headers | show |
On Wed, Mar 22, 2017 at 02:32:29PM +0100, Igor Mammedov wrote: > 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> > --- > hw/arm/virt.c | 4 ++++ > 1 file changed, 4 insertions(+) > > diff --git a/hw/arm/virt.c b/hw/arm/virt.c > index 4de46b1..0cbcbc1 100644 > --- a/hw/arm/virt.c > +++ b/hw/arm/virt.c > @@ -1364,6 +1364,7 @@ static void machvirt_init(MachineState *machine) > mc->possible_cpu_arch_ids(machine); > for (n = 0; n < machine->possible_cpus->len; n++) { > Object *cpuobj; > + CPUState *cs; > > if (n >= smp_cpus) { > break; > @@ -1373,6 +1374,9 @@ static void machvirt_init(MachineState *machine) > object_property_set_int(cpuobj, machine->possible_cpus->cpus[n].arch_id, > "mp-affinity", NULL); > > + cs = CPU(cpuobj); > + cs->cpu_index = n; > + > if (!vms->secure) { > object_property_set_bool(cpuobj, false, "has_el3", NULL); > } > -- > 2.7.4 > > Reviewed-by: Andrew Jones <drjones@redhat.com>
diff --git a/hw/arm/virt.c b/hw/arm/virt.c index 4de46b1..0cbcbc1 100644 --- a/hw/arm/virt.c +++ b/hw/arm/virt.c @@ -1364,6 +1364,7 @@ static void machvirt_init(MachineState *machine) mc->possible_cpu_arch_ids(machine); for (n = 0; n < machine->possible_cpus->len; n++) { Object *cpuobj; + CPUState *cs; if (n >= smp_cpus) { break; @@ -1373,6 +1374,9 @@ static void machvirt_init(MachineState *machine) object_property_set_int(cpuobj, machine->possible_cpus->cpus[n].arch_id, "mp-affinity", NULL); + cs = CPU(cpuobj); + cs->cpu_index = n; + if (!vms->secure) { object_property_set_bool(cpuobj, false, "has_el3", NULL); }
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> --- hw/arm/virt.c | 4 ++++ 1 file changed, 4 insertions(+)