From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:36688) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1drkxT-0001YI-Nn for qemu-devel@nongnu.org; Tue, 12 Sep 2017 09:10:32 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1drkxO-0004sQ-08 for qemu-devel@nongnu.org; Tue, 12 Sep 2017 09:10:31 -0400 Received: from mx1.redhat.com ([209.132.183.28]:34096) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1drkxN-0004s0-Nn for qemu-devel@nongnu.org; Tue, 12 Sep 2017 09:10:25 -0400 Date: Tue, 12 Sep 2017 15:09:47 +0200 From: Igor Mammedov Message-ID: <20170912150947.70cf9b71@nial.brq.redhat.com> In-Reply-To: <20170911152150.12535-15-david@redhat.com> References: <20170911152150.12535-1-david@redhat.com> <20170911152150.12535-15-david@redhat.com> MIME-Version: 1.0 Content-Type: text/plain; charset=US-ASCII Content-Transfer-Encoding: 7bit Subject: Re: [Qemu-devel] [PATCH v4 14/21] target/s390x: rename next_cpu_id to next_core_id List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: David Hildenbrand Cc: qemu-devel@nongnu.org, Matthew Rosato , thuth@redhat.com, Eduardo Habkost , cohuck@redhat.com, Richard Henderson , Alexander Graf , Markus Armbruster , borntraeger@de.ibm.com, Paolo Bonzini On Mon, 11 Sep 2017 17:21:43 +0200 David Hildenbrand wrote: > Adapt to the new term "core_id". While at it, fix the type and drop the > initialization to 0 (which is superfluous). > > Reviewed-by: Matthew Rosato > Signed-off-by: David Hildenbrand > --- > target/s390x/cpu-qom.h | 2 +- > target/s390x/cpu.c | 11 +++++------ > 2 files changed, 6 insertions(+), 7 deletions(-) > > diff --git a/target/s390x/cpu-qom.h b/target/s390x/cpu-qom.h > index 2435cd8390..2e446fab51 100644 > --- a/target/s390x/cpu-qom.h > +++ b/target/s390x/cpu-qom.h > @@ -54,7 +54,7 @@ typedef struct S390CPUClass { > bool is_migration_safe; > const char *desc; > > - int64_t next_cpu_id; > + uint32_t next_core_id; is it possible to hotplug cpus in out of order in real hw? > > DeviceRealize parent_realize; > void (*parent_reset)(CPUState *cpu); > diff --git a/target/s390x/cpu.c b/target/s390x/cpu.c > index 87ebbe5b28..8c1c644057 100644 > --- a/target/s390x/cpu.c > +++ b/target/s390x/cpu.c > @@ -198,7 +198,7 @@ static void s390_cpu_realizefn(DeviceState *dev, Error **errp) > } > #else > /* implicitly set for linux-user only */ > - cpu->env.core_id = scc->next_cpu_id; > + cpu->env.core_id = scc->next_core_id; > #endif > > if (cpu_exists(cpu->env.core_id)) { > @@ -206,10 +206,10 @@ static void s390_cpu_realizefn(DeviceState *dev, Error **errp) > ", it already exists", cpu->env.core_id); > goto out; > } > - if (cpu->env.core_id != scc->next_cpu_id) { > + if (cpu->env.core_id != scc->next_core_id) { > error_setg(&err, "Unable to add CPU with core-id: %" PRIu32 > - ", the next available core-id is %" PRIi64, cpu->env.core_id, > - scc->next_cpu_id); > + ", the next available core-id is %" PRIu32, cpu->env.core_id, > + scc->next_core_id); > goto out; > } > > @@ -219,7 +219,7 @@ static void s390_cpu_realizefn(DeviceState *dev, Error **errp) > if (err != NULL) { > goto out; > } > - scc->next_cpu_id++; > + scc->next_core_id++; > > #if !defined(CONFIG_USER_ONLY) > qemu_register_reset(s390_cpu_machine_reset_cb, cpu); > @@ -464,7 +464,6 @@ static void s390_cpu_class_init(ObjectClass *oc, void *data) > CPUClass *cc = CPU_CLASS(scc); > DeviceClass *dc = DEVICE_CLASS(oc); > > - scc->next_cpu_id = 0; > scc->parent_realize = dc->realize; > dc->realize = s390_cpu_realizefn; > dc->props = s390x_cpu_properties;