[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PULL for-2.6 04/11] s390x/cpu: Tolerate max_cpus
From: |
Cornelia Huck |
Subject: |
[Qemu-devel] [PULL for-2.6 04/11] s390x/cpu: Tolerate max_cpus |
Date: |
Fri, 11 Mar 2016 10:56:35 +0100 |
From: Matthew Rosato <address@hidden>
Once hotplug is enabled, interrupts may come in for CPUs
with an address > smp_cpus. Allocate for this and allow
search routines to look beyond smp_cpus.
Signed-off-by: Matthew Rosato <address@hidden>
Message-Id: <address@hidden>
Reviewed-by: David Hildenbrand <address@hidden>
Signed-off-by: Cornelia Huck <address@hidden>
---
hw/s390x/s390-virtio.c | 11 ++++++-----
1 file changed, 6 insertions(+), 5 deletions(-)
diff --git a/hw/s390x/s390-virtio.c b/hw/s390x/s390-virtio.c
index c501a48..57c3c88 100644
--- a/hw/s390x/s390-virtio.c
+++ b/hw/s390x/s390-virtio.c
@@ -58,15 +58,16 @@
#define S390_TOD_CLOCK_VALUE_MISSING 0x00
#define S390_TOD_CLOCK_VALUE_PRESENT 0x01
-static S390CPU **ipi_states;
+static S390CPU **cpu_states;
S390CPU *s390_cpu_addr2state(uint16_t cpu_addr)
{
- if (cpu_addr >= smp_cpus) {
+ if (cpu_addr >= max_cpus) {
return NULL;
}
- return ipi_states[cpu_addr];
+ /* Fast lookup via CPU ID */
+ return cpu_states[cpu_addr];
}
void s390_init_ipl_dev(const char *kernel_filename,
@@ -101,14 +102,14 @@ void s390_init_cpus(MachineState *machine)
machine->cpu_model = "host";
}
- ipi_states = g_malloc(sizeof(S390CPU *) * smp_cpus);
+ cpu_states = g_malloc0(sizeof(S390CPU *) * max_cpus);
for (i = 0; i < smp_cpus; i++) {
S390CPU *cpu;
cpu = cpu_s390x_init(machine->cpu_model);
- ipi_states[i] = cpu;
+ cpu_states[i] = cpu;
}
}
--
2.7.2
- [Qemu-devel] [PULL for-2.6 00/11] s390x patches for 2.6, Cornelia Huck, 2016/03/11
- [Qemu-devel] [PULL for-2.6 06/11] s390x/cpu: Add error handling to cpu creation, Cornelia Huck, 2016/03/11
- [Qemu-devel] [PULL for-2.6 01/11] s390x/cpu: Cleanup init in preparation for hotplug, Cornelia Huck, 2016/03/11
- [Qemu-devel] [PULL for-2.6 02/11] s390x/cpu: Set initial CPU state in common routine, Cornelia Huck, 2016/03/11
- [Qemu-devel] [PULL for-2.6 05/11] s390x/cpu: Add CPU property links, Cornelia Huck, 2016/03/11
- [Qemu-devel] [PULL for-2.6 03/11] s390x/cpu: Get rid of side effects when creating a vcpu, Cornelia Huck, 2016/03/11
- [Qemu-devel] [PULL for-2.6 08/11] pc-bios/s390-ccw: fix old bug in ptr increment, Cornelia Huck, 2016/03/11
- [Qemu-devel] [PULL for-2.6 04/11] s390x/cpu: Tolerate max_cpus,
Cornelia Huck <=
- [Qemu-devel] [PULL for-2.6 09/11] s390x: Introduce machine definition macros, Cornelia Huck, 2016/03/11
- [Qemu-devel] [PULL for-2.6 07/11] s390x/cpu: Allow hotplug of CPUs, Cornelia Huck, 2016/03/11
- [Qemu-devel] [PULL for-2.6 11/11] s390x/cpu: use g_new0, Cornelia Huck, 2016/03/11
- [Qemu-devel] [PULL for-2.6 10/11] s390x: Introduce S390MachineClass, Cornelia Huck, 2016/03/11
- Re: [Qemu-devel] [PULL for-2.6 00/11] s390x patches for 2.6, Peter Maydell, 2016/03/14