From: Andreas Färber <afaerber@suse.de>
Date: Thu, 3 May 2012 02:16:07 +0000 (+0200)
Subject: s390-virtio: Use cpu_s390x_init() to obtain S390CPU
X-Git-Tag: v2.7.1~4955^2~2
X-Git-Url: https://git.proxmox.com/?a=commitdiff_plain;h=6fc150de80ffa9d3a7eba3e4f26793eb44347eda;p=mirror_qemu.git

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>
---

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;
         }