diff options
| author | Matthew Rosato <mjrosato@linux.vnet.ibm.com> | 2016-03-04 12:34:30 -0500 |
|---|---|---|
| committer | Cornelia Huck <cornelia.huck@de.ibm.com> | 2016-03-10 10:37:15 +0100 |
| commit | ef3027affc755736f1ee5ec60c52a3b317abbc07 (patch) | |
| tree | 37f2a76d19a49f6d8cc15584eb93666f313fff01 | |
| parent | d2eae20790e825656b205dbe347826ff991fb3d8 (diff) | |
s390x/cpu: Set initial CPU state in common routine
Both initial and hotplugged CPUs need to set the same initial
state.
Signed-off-by: Matthew Rosato <mjrosato@linux.vnet.ibm.com>
Reviewed-by: David Hildenbrand <dahi@linux.vnet.ibm.com>
Message-Id: <1457112875-5209-3-git-send-email-mjrosato@linux.vnet.ibm.com>
Signed-off-by: Cornelia Huck <cornelia.huck@de.ibm.com>
| -rw-r--r-- | hw/s390x/s390-virtio.c | 4 | ||||
| -rw-r--r-- | target-s390x/cpu.c | 2 |
2 files changed, 2 insertions, 4 deletions
diff --git a/hw/s390x/s390-virtio.c b/hw/s390x/s390-virtio.c index d40d0dc75d..c501a480ee 100644 --- a/hw/s390x/s390-virtio.c +++ b/hw/s390x/s390-virtio.c @@ -105,14 +105,10 @@ void s390_init_cpus(MachineState *machine) for (i = 0; i < smp_cpus; i++) { S390CPU *cpu; - CPUState *cs; cpu = cpu_s390x_init(machine->cpu_model); - cs = CPU(cpu); ipi_states[i] = cpu; - cs->halted = 1; - cs->exception_index = EXCP_HLT; } } diff --git a/target-s390x/cpu.c b/target-s390x/cpu.c index 73a910d2fa..603c2a18fe 100644 --- a/target-s390x/cpu.c +++ b/target-s390x/cpu.c @@ -219,6 +219,8 @@ static void s390_cpu_initfn(Object *obj) #endif cs->env_ptr = env; + cs->halted = 1; + cs->exception_index = EXCP_HLT; cpu_exec_init(cs, &error_abort); #if !defined(CONFIG_USER_ONLY) qemu_register_reset(s390_cpu_machine_reset_cb, cpu); |