diff options
| author | Christian Borntraeger <borntraeger@de.ibm.com> | 2013-07-25 16:45:51 +0200 |
|---|---|---|
| committer | Christian Borntraeger <borntraeger@de.ibm.com> | 2013-08-30 12:49:30 +0200 |
| commit | 29c6157ca7bfa036a8c59805c1a1d76ba9a2a851 (patch) | |
| tree | 8af61b7cbe83556e21967b9fa037598052c1396e /target-s390x/cpu.c | |
| parent | 4e872a3fb024f0d742ef6b48be3afaab2c4453fc (diff) | |
| download | qemu-29c6157ca7bfa036a8c59805c1a1d76ba9a2a851.tar.gz | |
s390: provide a cpu load normal function
Some code needs to perform an IPL-like bootup that mimics the
ESA (31bit) restart. Provide a cpu class method that does so.
Signed-off-by: Christian Borntraeger <borntraeger@de.ibm.com>
Acked-by: Alexander Graf <agraf@suse.de>
Diffstat (limited to 'target-s390x/cpu.c')
| -rw-r--r-- | target-s390x/cpu.c | 14 |
1 files changed, 14 insertions, 0 deletions
diff --git a/target-s390x/cpu.c b/target-s390x/cpu.c index 5cc99387b2..69f5e105dd 100644 --- a/target-s390x/cpu.c +++ b/target-s390x/cpu.c @@ -65,6 +65,17 @@ static void s390_cpu_set_pc(CPUState *cs, vaddr value) cpu->env.psw.addr = value; } +#if !defined(CONFIG_USER_ONLY) +/* S390CPUClass::load_normal() */ +static void s390_cpu_load_normal(CPUState *s) +{ + S390CPU *cpu = S390_CPU(s); + cpu->env.psw.addr = ldl_phys(4) & PSW_MASK_ESA_ADDR; + cpu->env.psw.mask = PSW_MASK_32 | PSW_MASK_64; + s390_add_running_cpu(cpu); +} +#endif + /* CPUClass::reset() */ static void s390_cpu_reset(CPUState *s) { @@ -169,6 +180,9 @@ static void s390_cpu_class_init(ObjectClass *oc, void *data) dc->realize = s390_cpu_realizefn; scc->parent_reset = cc->reset; +#if !defined(CONFIG_USER_ONLY) + scc->load_normal = s390_cpu_load_normal; +#endif cc->reset = s390_cpu_reset; cc->do_interrupt = s390_cpu_do_interrupt; |