aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndreas Färber <afaerber@suse.de>2012-05-03 04:16:07 +0200
committerAndreas Färber <afaerber@suse.de>2012-06-11 00:23:04 +0200
commit6fc150de80ffa9d3a7eba3e4f26793eb44347eda (patch)
treef9cfa371e39f14a17e84a6314e27c63a032ec481
parent564b863d8e4015d763acc6e4f010b031594fa7e5 (diff)
s390-virtio: Use cpu_s390x_init() to obtain S390CPU
Needed to store S390CPU in ipi_states[]. Signed-off-by: Andreas Färber <afaerber@suse.de>
-rw-r--r--hw/s390-virtio.c4
1 files changed, 3 insertions, 1 deletions
diff --git a/hw/s390-virtio.c b/hw/s390-virtio.c
index c0e19fd66d..49b3495248 100644
--- a/hw/s390-virtio.c
+++ b/hw/s390-virtio.c
@@ -209,9 +209,11 @@ static void s390_init(ram_addr_t my_ram_size,
ipi_states = g_malloc(sizeof(CPUS390XState *) * smp_cpus);
for (i = 0; i < smp_cpus; i++) {
+ S390CPU *cpu;
CPUS390XState *tmp_env;
- tmp_env = cpu_init(cpu_model);
+ cpu = cpu_s390x_init(cpu_model);
+ tmp_env = &cpu->env;
if (!env) {
env = tmp_env;
}