summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDavid Hildenbrand2017-09-13 15:24:07 +0200
committerCornelia Huck2017-09-19 18:31:32 +0200
commit88556edd74c82c7bb966f0e64d400f2ac898108d (patch)
tree522e6b5047960ea2723095bebf59f971d5b6cc16
parents390x: allow only 1 CPU with TCG (diff)
downloadqemu-88556edd74c82c7bb966f0e64d400f2ac898108d.tar.gz
qemu-88556edd74c82c7bb966f0e64d400f2ac898108d.tar.xz
qemu-88556edd74c82c7bb966f0e64d400f2ac898108d.zip
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>
-rw-r--r--target/s390x/cpu.c11
1 files changed, 4 insertions, 7 deletions
diff --git a/target/s390x/cpu.c b/target/s390x/cpu.c
index 74b3e4fd0d..5f9315fb16 100644
--- a/target/s390x/cpu.c
+++ b/target/s390x/cpu.c
@@ -194,7 +194,11 @@ static void s390_cpu_realizefn(DeviceState *dev, Error **errp)
", max allowed: %d", cpu->id, max_cpus - 1);
goto out;
}
+#else
+ /* implicitly set for linux-user only */
+ cpu->id = scc->next_cpu_id;
#endif
+
if (cpu_exists(cpu->id)) {
error_setg(&err, "Unable to add CPU: %" PRIi64
", it already exists", cpu->id);
@@ -306,13 +310,6 @@ static void s390_cpu_initfn(Object *obj)
inited = true;
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)