diff options
| author | Andreas Färber <afaerber@suse.de> | 2012-05-03 04:28:14 +0200 |
|---|---|---|
| committer | Andreas Färber <afaerber@suse.de> | 2012-06-11 00:23:04 +0200 |
| commit | 45fa769b32861573409bceff53251cffafcf10a9 (patch) | |
| tree | 9ae783217ed7c73f6685bf9bffb75b9c3020b86b /hw/s390-virtio.c | |
| parent | 6fc150de80ffa9d3a7eba3e4f26793eb44347eda (diff) | |
s390-virtio: Let s390_cpu_addr2state() return S390CPU
Convert ipi_states to S390CPU**.
Needed for s390_cpu_restart() in handle_sigp().
Signed-off-by: Andreas Färber <afaerber@suse.de>
Diffstat (limited to 'hw/s390-virtio.c')
| -rw-r--r-- | hw/s390-virtio.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/hw/s390-virtio.c b/hw/s390-virtio.c index 49b3495248..47eed35da3 100644 --- a/hw/s390-virtio.c +++ b/hw/s390-virtio.c @@ -61,9 +61,9 @@ #define MAX_BLK_DEVS 10 static VirtIOS390Bus *s390_bus; -static CPUS390XState **ipi_states; +static S390CPU **ipi_states; -CPUS390XState *s390_cpu_addr2state(uint16_t cpu_addr) +S390CPU *s390_cpu_addr2state(uint16_t cpu_addr) { if (cpu_addr >= smp_cpus) { return NULL; @@ -206,7 +206,7 @@ static void s390_init(ram_addr_t my_ram_size, cpu_model = "host"; } - ipi_states = g_malloc(sizeof(CPUS390XState *) * smp_cpus); + ipi_states = g_malloc(sizeof(S390CPU *) * smp_cpus); for (i = 0; i < smp_cpus; i++) { S390CPU *cpu; @@ -217,7 +217,7 @@ static void s390_init(ram_addr_t my_ram_size, if (!env) { env = tmp_env; } - ipi_states[i] = tmp_env; + ipi_states[i] = cpu; tmp_env->halted = 1; tmp_env->exception_index = EXCP_HLT; tmp_env->storage_keys = storage_keys; |