From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:60006) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1acpdI-0002en-Q9 for qemu-devel@nongnu.org; Mon, 07 Mar 2016 02:31:13 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1acpdD-0000Og-S2 for qemu-devel@nongnu.org; Mon, 07 Mar 2016 02:31:12 -0500 Received: from e06smtp17.uk.ibm.com ([195.75.94.113]:36736) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1acpdD-0000Lu-Gw for qemu-devel@nongnu.org; Mon, 07 Mar 2016 02:31:07 -0500 Received: from localhost by e06smtp17.uk.ibm.com with IBM ESMTP SMTP Gateway: Authorized Use Only! Violators will be prosecuted for from ; Mon, 7 Mar 2016 07:30:43 -0000 Received: from b06cxnps4076.portsmouth.uk.ibm.com (d06relay13.portsmouth.uk.ibm.com [9.149.109.198]) by d06dlp03.portsmouth.uk.ibm.com (Postfix) with ESMTP id 8014F1B08061 for ; Mon, 7 Mar 2016 07:31:05 +0000 (GMT) Received: from d06av10.portsmouth.uk.ibm.com (d06av10.portsmouth.uk.ibm.com [9.149.37.251]) by b06cxnps4076.portsmouth.uk.ibm.com (8.14.9/8.14.9/NCO v10.0) with ESMTP id u277UeKA66453554 for ; Mon, 7 Mar 2016 07:30:40 GMT Received: from d06av10.portsmouth.uk.ibm.com (localhost [127.0.0.1]) by d06av10.portsmouth.uk.ibm.com (8.14.4/8.14.4/NCO v10.0 AVout) with ESMTP id u276Ugj5023942 for ; Sun, 6 Mar 2016 23:30:42 -0700 Date: Mon, 7 Mar 2016 08:30:37 +0100 From: David Hildenbrand Message-ID: <20160307083037.1a3976c1@thinkpad-w530> In-Reply-To: <1457112875-5209-5-git-send-email-mjrosato@linux.vnet.ibm.com> References: <1457112875-5209-1-git-send-email-mjrosato@linux.vnet.ibm.com> <1457112875-5209-5-git-send-email-mjrosato@linux.vnet.ibm.com> MIME-Version: 1.0 Content-Type: text/plain; charset=US-ASCII Content-Transfer-Encoding: 7bit Subject: Re: [Qemu-devel] [PATCH v9 4/7] s390x/cpu: Tolerate max_cpus List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: Matthew Rosato Cc: imammedo@redhat.com, qemu-devel@nongnu.org, agraf@suse.de, borntraeger@de.ibm.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 Reviewed-by: David Hildenbrand > --- > 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; > } > } > David