target/s390x: set cpu->id for linux user when realizing
scc->next_cpu_id is updated when realizing. Setting it just before that point looks cleaner. Reviewed-by: Matthew Rosato <mjrosato@linux.vnet.ibm.com> Reviewed-by: Igor Mammedov <imammedo@redhat.com> Signed-off-by: David Hildenbrand <david@redhat.com> Message-Id: <20170913132417.24384-13-david@redhat.com> Signed-off-by: Cornelia Huck <cohuck@redhat.com>
This commit is contained in:
parent
b5684cd8c6
commit
88556edd74
|
@ -194,7 +194,11 @@ static void s390_cpu_realizefn(DeviceState *dev, Error **errp)
|
||||||
", max allowed: %d", cpu->id, max_cpus - 1);
|
", max allowed: %d", cpu->id, max_cpus - 1);
|
||||||
goto out;
|
goto out;
|
||||||
}
|
}
|
||||||
|
#else
|
||||||
|
/* implicitly set for linux-user only */
|
||||||
|
cpu->id = scc->next_cpu_id;
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
if (cpu_exists(cpu->id)) {
|
if (cpu_exists(cpu->id)) {
|
||||||
error_setg(&err, "Unable to add CPU: %" PRIi64
|
error_setg(&err, "Unable to add CPU: %" PRIi64
|
||||||
", it already exists", cpu->id);
|
", it already exists", cpu->id);
|
||||||
|
@ -306,13 +310,6 @@ static void s390_cpu_initfn(Object *obj)
|
||||||
inited = true;
|
inited = true;
|
||||||
s390x_translate_init();
|
s390x_translate_init();
|
||||||
}
|
}
|
||||||
|
|
||||||
#if defined(CONFIG_USER_ONLY)
|
|
||||||
{
|
|
||||||
S390CPUClass *scc = S390_CPU_GET_CLASS(obj);
|
|
||||||
cpu->id = scc->next_cpu_id;
|
|
||||||
}
|
|
||||||
#endif
|
|
||||||
}
|
}
|
||||||
|
|
||||||
static void s390_cpu_finalize(Object *obj)
|
static void s390_cpu_finalize(Object *obj)
|
||||||
|
|
Loading…
Reference in a new issue