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

target-s390x: Introduce QOM realizefn for S390CPU 

Introduce realizefn and set realized = true in cpu_s390x_init().

Defer CPU reset from initfn to realizefn.

Acked-by: Richard Henderson <rth@twiddle.net>
[AF: Invoke parent's realizefn]
Signed-off-by: Andreas Färber <afaerber@suse.de>
This commit is contained in:
Andreas Färber 2013-01-16 04:00:41 +01:00
parent c1caf1d961
commit 1f1366322b
3 changed files with 19 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -34,6 +34,7 @@
/** /**
* S390CPUClass: * S390CPUClass:
* @parent_realize: The parent class' realize handler.
* @parent_reset: The parent class' reset handler. * @parent_reset: The parent class' reset handler.
* *
* An S/390 CPU model. * An S/390 CPU model.
@ -43,6 +44,7 @@ typedef struct S390CPUClass {
CPUClass parent_class; CPUClass parent_class;
/*< public >*/ /*< public >*/
DeviceRealize parent_realize;
void (*parent_reset)(CPUState *cpu); void (*parent_reset)(CPUState *cpu);
} S390CPUClass; } S390CPUClass;

16
target-s390x/cpu.c
View File

@ -97,6 +97,17 @@ static void s390_cpu_machine_reset_cb(void *opaque)
} }
#endif #endif
static void s390_cpu_realizefn(DeviceState *dev, Error **errp)
{
S390CPU *cpu = S390_CPU(dev);
S390CPUClass *scc = S390_CPU_GET_CLASS(dev);
qemu_init_vcpu(&cpu->env);
cpu_reset(CPU(cpu));
scc->parent_realize(dev, errp);
}
static void s390_cpu_initfn(Object *obj) static void s390_cpu_initfn(Object *obj)
{ {
S390CPU *cpu = S390_CPU(obj); S390CPU *cpu = S390_CPU(obj);
@ -122,8 +133,6 @@ static void s390_cpu_initfn(Object *obj)
#endif #endif
env->cpu_num = cpu_num++; env->cpu_num = cpu_num++;
env->ext_index = -1; env->ext_index = -1;
cpu_reset(CPU(cpu));
} }
static void s390_cpu_finalize(Object *obj) static void s390_cpu_finalize(Object *obj)
@ -146,6 +155,9 @@ 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->parent_realize = dc->realize;
dc->realize = s390_cpu_realizefn;
scc->parent_reset = cc->reset; scc->parent_reset = cc->reset;
cc->reset = s390_cpu_reset; cc->reset = s390_cpu_reset;

4
target-s390x/helper.c
View File

@ -85,7 +85,9 @@ S390CPU *cpu_s390x_init(const char *cpu_model)
} }
env->cpu_model_str = cpu_model; env->cpu_model_str = cpu_model;
qemu_init_vcpu(env);
object_property_set_bool(OBJECT(cpu), true, "realized", NULL);
return cpu; return cpu;
} }