From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:54790) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1abapb-0001nm-Ua for qemu-devel@nongnu.org; Thu, 03 Mar 2016 16:30:48 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1abapZ-0001lW-Vb for qemu-devel@nongnu.org; Thu, 03 Mar 2016 16:30:47 -0500 Received: from e34.co.us.ibm.com ([32.97.110.152]:38901) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1abapZ-0001lJ-NO for qemu-devel@nongnu.org; Thu, 03 Mar 2016 16:30:45 -0500 Received: from localhost by e34.co.us.ibm.com with IBM ESMTP SMTP Gateway: Authorized Use Only! Violators will be prosecuted for from ; Thu, 3 Mar 2016 14:30:45 -0700 Received: from b03cxnp08027.gho.boulder.ibm.com (b03cxnp08027.gho.boulder.ibm.com [9.17.130.19]) by d03dlp01.boulder.ibm.com (Postfix) with ESMTP id 44DA11FF0023 for ; Thu, 3 Mar 2016 14:18:51 -0700 (MST) Received: from d03av02.boulder.ibm.com (d03av02.boulder.ibm.com [9.17.195.168]) by b03cxnp08027.gho.boulder.ibm.com (8.14.9/8.14.9/NCO v10.0) with ESMTP id u23LUfxX33292518 for ; Thu, 3 Mar 2016 14:30:41 -0700 Received: from d03av02.boulder.ibm.com (localhost [127.0.0.1]) by d03av02.boulder.ibm.com (8.14.4/8.14.4/NCO v10.0 AVout) with ESMTP id u23LUe9w000666 for ; Thu, 3 Mar 2016 14:30:40 -0700 From: Matthew Rosato Date: Thu, 3 Mar 2016 16:30:30 -0500 Message-Id: <1457040633-30951-5-git-send-email-mjrosato@linux.vnet.ibm.com> In-Reply-To: <1457040633-30951-1-git-send-email-mjrosato@linux.vnet.ibm.com> References: <1457040633-30951-1-git-send-email-mjrosato@linux.vnet.ibm.com> Subject: [Qemu-devel] [PATCH v8 4/7] s390x/cpu: Tolerate max_cpus List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Cc: dahi@linux.vnet.ibm.com, agraf@suse.de, borntraeger@de.ibm.com, imammedo@redhat.com, bharata@linux.vnet.ibm.com, cornelia.huck@de.ibm.com, pbonzini@redhat.com, afaerber@suse.de, rth@twiddle.net 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 --- hw/s390x/s390-virtio.c | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-) diff --git a/hw/s390x/s390-virtio.c b/hw/s390x/s390-virtio.c index c501a48..90bc58a 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++) { + for (i = 0; i < max_cpus; i++) { S390CPU *cpu; cpu = cpu_s390x_init(machine->cpu_model); - ipi_states[i] = cpu; + cpu_states[i] = cpu; } } -- 1.9.1