From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:36044) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1adhuK-0007Jz-AZ for qemu-devel@nongnu.org; Wed, 09 Mar 2016 12:28:25 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1adhuF-0005kz-Bq for qemu-devel@nongnu.org; Wed, 09 Mar 2016 12:28:24 -0500 Received: from e06smtp15.uk.ibm.com ([195.75.94.111]:38068) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1adhuE-0005je-VU for qemu-devel@nongnu.org; Wed, 09 Mar 2016 12:28:19 -0500 Received: from localhost by e06smtp15.uk.ibm.com with IBM ESMTP SMTP Gateway: Authorized Use Only! Violators will be prosecuted for from ; Wed, 9 Mar 2016 17:28:15 -0000 Received: from b06cxnps4075.portsmouth.uk.ibm.com (d06relay12.portsmouth.uk.ibm.com [9.149.109.197]) by d06dlp03.portsmouth.uk.ibm.com (Postfix) with ESMTP id 2D2151B0806E for ; Wed, 9 Mar 2016 17:28:39 +0000 (GMT) Received: from d06av05.portsmouth.uk.ibm.com (d06av05.portsmouth.uk.ibm.com [9.149.37.229]) by b06cxnps4075.portsmouth.uk.ibm.com (8.14.9/8.14.9/NCO v10.0) with ESMTP id u29HSDft56557650 for ; Wed, 9 Mar 2016 17:28:13 GMT Received: from d06av05.portsmouth.uk.ibm.com (localhost [127.0.0.1]) by d06av05.portsmouth.uk.ibm.com (8.14.4/8.14.4/NCO v10.0 AVout) with ESMTP id u29HSCWD010909 for ; Wed, 9 Mar 2016 10:28:12 -0700 From: Cornelia Huck Date: Wed, 9 Mar 2016 18:28:02 +0100 Message-Id: <1457544488-5276-5-git-send-email-cornelia.huck@de.ibm.com> In-Reply-To: <1457544488-5276-1-git-send-email-cornelia.huck@de.ibm.com> References: <1457544488-5276-1-git-send-email-cornelia.huck@de.ibm.com> Subject: [Qemu-devel] [PATCH for-2.6 04/10] s390x/cpu: Tolerate max_cpus List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Cc: Matthew Rosato , borntraeger@de.ibm.com, jfrei@linux.vnet.ibm.com, Cornelia Huck , agraf@suse.de From: Matthew Rosato 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 Message-Id: <1457112875-5209-5-git-send-email-mjrosato@linux.vnet.ibm.com> Reviewed-by: David Hildenbrand Signed-off-by: Cornelia Huck --- 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.3.9