From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:43231) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1abkkX-0004bP-0m for qemu-devel@nongnu.org; Fri, 04 Mar 2016 03:06:13 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1abkkT-0004iO-Q4 for qemu-devel@nongnu.org; Fri, 04 Mar 2016 03:06:12 -0500 Received: from e06smtp12.uk.ibm.com ([195.75.94.108]:41670) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1abkkT-0004iF-HA for qemu-devel@nongnu.org; Fri, 04 Mar 2016 03:06:09 -0500 Received: from localhost by e06smtp12.uk.ibm.com with IBM ESMTP SMTP Gateway: Authorized Use Only! Violators will be prosecuted for from ; Fri, 4 Mar 2016 08:06:07 -0000 Received: from b06cxnps4074.portsmouth.uk.ibm.com (d06relay11.portsmouth.uk.ibm.com [9.149.109.196]) by d06dlp01.portsmouth.uk.ibm.com (Postfix) with ESMTP id E495317D8062 for ; Fri, 4 Mar 2016 08:06:18 +0000 (GMT) Received: from d06av03.portsmouth.uk.ibm.com (d06av03.portsmouth.uk.ibm.com [9.149.37.213]) by b06cxnps4074.portsmouth.uk.ibm.com (8.14.9/8.14.9/NCO v10.0) with ESMTP id u2485r2062259398 for ; Fri, 4 Mar 2016 08:05:53 GMT Received: from d06av03.portsmouth.uk.ibm.com (localhost [127.0.0.1]) by d06av03.portsmouth.uk.ibm.com (8.14.4/8.14.4/NCO v10.0 AVout) with ESMTP id u2485q6i001789 for ; Fri, 4 Mar 2016 01:05:52 -0700 Date: Fri, 4 Mar 2016 09:05:51 +0100 From: David Hildenbrand Message-ID: <20160304090551.235f19af@thinkpad-w530> In-Reply-To: <1457040633-30951-5-git-send-email-mjrosato@linux.vnet.ibm.com> References: <1457040633-30951-1-git-send-email-mjrosato@linux.vnet.ibm.com> <1457040633-30951-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 v8 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 > --- > 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; This looks wrong (creating all cpus). But the net patch fixes it again. Can you make this patch a simple rename patch and move the max_cpu stuff into the next patch if this makes sense? Or simply set the cpu_state for everything above smp_cpus to zero in this patch. Whatever you think makes sense. > } > } > David