OpenE2K/qemu-e2k
13
4
Fork 0
Code Issues 4 Pull Requests Projects 2 Releases Activity

target/s390x: set cpu->id for linux user when realizing

Browse Source 
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:
David Hildenbrand 2017-09-13 15:24:07 +02:00 committed by Cornelia Huck
parent b5684cd8c6
commit 88556edd74
1 changed files with 4 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
target/s390x/cpu.c
View File

@ -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)