From b63578bdb50243d05c48c3c94cc58ae446f2eb93 Mon Sep 17 00:00:00 2001 From: Igor Mammedov Date: Thu, 21 Jul 2016 17:54:37 +0200 Subject: [PATCH] spapr: init CPUState->cpu_index with index relative to core-id It will enshure that cpu_index for a given cpu stays the same regardless of the order cpus has been created/deleted and so it would be possible to migrate QEMU instance with out of order created CPU. Signed-off-by: Igor Mammedov Signed-off-by: David Gibson --- hw/ppc/spapr_cpu_core.c | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/hw/ppc/spapr_cpu_core.c b/hw/ppc/spapr_cpu_core.c index c04aaa47d7..1f3f4dd1e8 100644 --- a/hw/ppc/spapr_cpu_core.c +++ b/hw/ppc/spapr_cpu_core.c @@ -307,9 +307,13 @@ static void spapr_cpu_core_realize(DeviceState *dev, Error **errp) sc->threads = g_malloc0(size * cc->nr_threads); for (i = 0; i < cc->nr_threads; i++) { char id[32]; + CPUState *cs; + obj = sc->threads + i * size; object_initialize(obj, size, typename); + cs = CPU(obj); + cs->cpu_index = cc->core_id + i; snprintf(id, sizeof(id), "thread[%d]", i); object_property_add_child(OBJECT(sc), id, obj, &local_err); if (local_err) { -- 2.11.4.GIT