ShuriZma
/
xemu
mirror of https://github.com/xemu-project/xemu.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

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>
This commit is contained in:
Matthew Rosato 2016-03-04 12:34:30 -05:00 committed by Cornelia Huck
parent d2eae20790
commit ef3027affc
2 changed files with 2 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
hw/s390x/s390-virtio.c
View File

@ -105,14 +105,10 @@ void s390_init_cpus(MachineState *machine)
for (i = 0; i < smp_cpus; i++) { for (i = 0; i < smp_cpus; i++) {
S390CPU *cpu; S390CPU *cpu;
CPUState *cs;
cpu = cpu_s390x_init(machine->cpu_model); cpu = cpu_s390x_init(machine->cpu_model);
cs = CPU(cpu);
ipi_states[i] = cpu; ipi_states[i] = cpu;
cs->halted = 1;
cs->exception_index = EXCP_HLT;
} }
} }

2
target-s390x/cpu.c
View File

@ -219,6 +219,8 @@ static void s390_cpu_initfn(Object *obj)
#endif #endif
cs->env_ptr = env; cs->env_ptr = env;
cs->halted = 1;
cs->exception_index = EXCP_HLT;
cpu_exec_init(cs, &error_abort); cpu_exec_init(cs, &error_abort);
#if !defined(CONFIG_USER_ONLY) #if !defined(CONFIG_USER_ONLY)
qemu_register_reset(s390_cpu_machine_reset_cb, cpu); qemu_register_reset(s390_cpu_machine_reset_cb, cpu);