diff options
| author | Matthew Rosato <mjrosato@linux.vnet.ibm.com> | 2016-03-04 12:34:30 -0500 |
|---|---|---|
| committer | Timothy Pearson <tpearson@raptorengineering.com> | 2019-11-29 19:49:36 -0600 |
| commit | 7815362890040d8ac3f7b03026ba97aaf6551321 (patch) | |
| tree | a92162f3adb0428336367cca7f0d1e0b3ac39708 | |
| parent | 5351ed0fd98aa3b978b187f1821d581ca4aff749 (diff) | |
| download | hqemu-7815362890040d8ac3f7b03026ba97aaf6551321.zip hqemu-7815362890040d8ac3f7b03026ba97aaf6551321.tar.gz | |
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 d40d0dc..c501a48 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 73a910d..603c2a1 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); |
