diff options
| author | Andreas Färber <afaerber@suse.de> | 2013-01-30 12:48:25 +0000 |
|---|---|---|
| committer | Alexander Graf <agraf@suse.de> | 2013-02-01 02:02:20 +0100 |
| commit | 49e158785fa86f04e2d4027dd19719d8b79a4421 (patch) | |
| tree | 0e1d3decf95881f0e7d30edc2a3a969c58a64006 /hw/s390x/ipl.c | |
| parent | f94667336ecf6566e090a895a37bc06da435d686 (diff) | |
| download | qemu-49e158785fa86f04e2d4027dd19719d8b79a4421.tar.gz | |
target-s390x: Pass S390CPU to s390_{add, del}_running_cpu()
This prepares for moving the halted field to CPUState.
Most call sites can already supply S390CPU, for some env becomes unused.
Signed-off-by: Andreas Färber <afaerber@suse.de>
Acked-by: Cornelia Huck <cornelia.huck@de.ibm.com>
Signed-off-by: Alexander Graf <agraf@suse.de>
Diffstat (limited to 'hw/s390x/ipl.c')
| -rw-r--r-- | hw/s390x/ipl.c | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/hw/s390x/ipl.c b/hw/s390x/ipl.c index 86e84153ad..206d552e16 100644 --- a/hw/s390x/ipl.c +++ b/hw/s390x/ipl.c @@ -58,10 +58,12 @@ typedef struct S390IPLState { static void s390_ipl_cpu(uint64_t pswaddr) { - CPUS390XState *env = &S390_CPU(qemu_get_cpu(0))->env; + S390CPU *cpu = S390_CPU(qemu_get_cpu(0)); + CPUS390XState *env = &cpu->env; + env->psw.addr = pswaddr; env->psw.mask = IPL_PSW_MASK; - s390_add_running_cpu(env); + s390_add_running_cpu(cpu); } static int s390_ipl_init(SysBusDevice *dev) |