mirrors/qemu
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

s390x/cpu: Get rid of side effects when creating a vcpu

Browse Source 
In preparation for hotplug, defer some CPU initialization
until the device is actually being realized, including
cpu_exec_init.

Signed-off-by: Matthew Rosato <mjrosato@linux.vnet.ibm.com>
Reviewed-by: David Hildenbrand <dahi@linux.vnet.ibm.com>
Message-Id: <1457112875-5209-4-git-send-email-mjrosato@linux.vnet.ibm.com>
Signed-off-by: Cornelia Huck <cornelia.huck@de.ibm.com>
This commit is contained in:
Matthew Rosato 2016-03-04 12:34:31 -05:00 committed by Cornelia Huck
parent ef3027affc
commit c6644fc88b
2 changed files with 17 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
target-s390x/cpu-qom.h
View File

@ -47,6 +47,8 @@ typedef struct S390CPUClass {
CPUClass parent_class; CPUClass parent_class;
/*< public >*/ /*< public >*/
int64_t next_cpu_id;
DeviceRealize parent_realize; DeviceRealize parent_realize;
void (*parent_reset)(CPUState *cpu); void (*parent_reset)(CPUState *cpu);
void (*load_normal)(CPUState *cpu); void (*load_normal)(CPUState *cpu);

20
target-s390x/cpu.c
View File

@ -195,7 +195,20 @@ static void s390_cpu_realizefn(DeviceState *dev, Error **errp)
{ {
CPUState *cs = CPU(dev); CPUState *cs = CPU(dev);
S390CPUClass *scc = S390_CPU_GET_CLASS(dev); S390CPUClass *scc = S390_CPU_GET_CLASS(dev);
S390CPU *cpu = S390_CPU(dev);
CPUS390XState *env = &cpu->env;
Error *err = NULL;
cpu_exec_init(cs, &err);
if (err != NULL) {
error_propagate(errp, err);
return;
}
#if !defined(CONFIG_USER_ONLY)
qemu_register_reset(s390_cpu_machine_reset_cb, cpu);
#endif
env->cpu_num = scc->next_cpu_id++;
s390_cpu_gdb_init(cs); s390_cpu_gdb_init(cs);
qemu_init_vcpu(cs); qemu_init_vcpu(cs);
#if !defined(CONFIG_USER_ONLY) #if !defined(CONFIG_USER_ONLY)
@ -213,7 +226,6 @@ static void s390_cpu_initfn(Object *obj)
S390CPU *cpu = S390_CPU(obj); S390CPU *cpu = S390_CPU(obj);
CPUS390XState *env = &cpu->env; CPUS390XState *env = &cpu->env;
static bool inited; static bool inited;
static int cpu_num = 0;
#if !defined(CONFIG_USER_ONLY) #if !defined(CONFIG_USER_ONLY)
struct tm tm; struct tm tm;
#endif #endif
@ -221,9 +233,7 @@ static void s390_cpu_initfn(Object *obj)
cs->env_ptr = env; cs->env_ptr = env;
cs->halted = 1; cs->halted = 1;
cs->exception_index = EXCP_HLT; cs->exception_index = EXCP_HLT;
cpu_exec_init(cs, &error_abort);
#if !defined(CONFIG_USER_ONLY) #if !defined(CONFIG_USER_ONLY)
qemu_register_reset(s390_cpu_machine_reset_cb, cpu);
qemu_get_timedate(&tm, 0); qemu_get_timedate(&tm, 0);
env->tod_offset = TOD_UNIX_EPOCH + env->tod_offset = TOD_UNIX_EPOCH +
(time2tod(mktimegm(&tm)) * 1000000000ULL); (time2tod(mktimegm(&tm)) * 1000000000ULL);
@ -232,7 +242,6 @@ static void s390_cpu_initfn(Object *obj)
env->cpu_timer = timer_new_ns(QEMU_CLOCK_VIRTUAL, s390x_cpu_timer, cpu); env->cpu_timer = timer_new_ns(QEMU_CLOCK_VIRTUAL, s390x_cpu_timer, cpu);
s390_cpu_set_state(CPU_STATE_STOPPED, cpu); s390_cpu_set_state(CPU_STATE_STOPPED, cpu);
#endif #endif
env->cpu_num = cpu_num++;
if (tcg_enabled() && !inited) { if (tcg_enabled() && !inited) {
inited = true; inited = true;
@ -339,6 +348,7 @@ static void s390_cpu_class_init(ObjectClass *oc, void *data)
CPUClass *cc = CPU_CLASS(scc); CPUClass *cc = CPU_CLASS(scc);
DeviceClass *dc = DEVICE_CLASS(oc); DeviceClass *dc = DEVICE_CLASS(oc);
scc->next_cpu_id = 0;
scc->parent_realize = dc->realize; scc->parent_realize = dc->realize;
dc->realize = s390_cpu_realizefn; dc->realize = s390_cpu_realizefn;
@ -371,7 +381,7 @@ static void s390_cpu_class_init(ObjectClass *oc, void *data)
cc->gdb_arch_name = s390_gdb_arch_name; cc->gdb_arch_name = s390_gdb_arch_name;
/* /*
* Reason: s390_cpu_initfn() calls cpu_exec_init(), which saves * Reason: s390_cpu_realizefn() calls cpu_exec_init(), which saves
* the object in cpus -> dangling pointer after final * the object in cpus -> dangling pointer after final
* object_unref(). * object_unref().
*/ */