From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from list by lists.gnu.org with archive (Exim 4.71) id 1hYiaB-0003zI-BG for mharc-qemu-trivial@gnu.org; Wed, 05 Jun 2019 22:56:51 -0400 Received: from eggs.gnu.org ([209.51.188.92]:53555) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1hYia8-0003xK-GQ for qemu-trivial@nongnu.org; Wed, 05 Jun 2019 22:56:49 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1hYia7-0003fk-Bl for qemu-trivial@nongnu.org; Wed, 05 Jun 2019 22:56:48 -0400 Received: from mx1.redhat.com ([209.132.183.28]:42420) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1hYia2-0003S2-71; Wed, 05 Jun 2019 22:56:42 -0400 Received: from smtp.corp.redhat.com (int-mx06.intmail.prod.int.phx2.redhat.com [10.5.11.16]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id 3D065300415C; Thu, 6 Jun 2019 02:56:39 +0000 (UTC) Received: from localhost (ovpn-116-9.gru2.redhat.com [10.97.116.9]) by smtp.corp.redhat.com (Postfix) with ESMTP id 97088518E2; Thu, 6 Jun 2019 02:56:36 +0000 (UTC) Date: Wed, 5 Jun 2019 23:56:35 -0300 From: Eduardo Habkost To: Like Xu Cc: qemu-trivial@nongnu.org, Peter Maydell , qemu-devel@nongnu.org, "Dr . David Alan Gilbert" , Alistair Francis , Igor Mammedov , Cornelia Huck , Halil Pasic , Christian Borntraeger , Richard Henderson , David Hildenbrand , qemu-s390x@nongnu.org Message-ID: <20190606025635.GO22416@habkost.net> References: <20190518205428.90532-1-like.xu@linux.intel.com> <20190518205428.90532-7-like.xu@linux.intel.com> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <20190518205428.90532-7-like.xu@linux.intel.com> X-Scanned-By: MIMEDefang 2.79 on 10.5.11.16 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.46]); Thu, 06 Jun 2019 02:56:39 +0000 (UTC) X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] X-Received-From: 209.132.183.28 Subject: Re: [Qemu-trivial] [Qemu-devel] [PATCH v3 06/10] hw/s390x: Replace global smp variables with machine smp properties X-BeenThere: qemu-trivial@nongnu.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 06 Jun 2019 02:56:49 -0000 On Sun, May 19, 2019 at 04:54:24AM +0800, Like Xu wrote: > The global smp variables in s390x are replaced with smp machine properties. > > A local variable of the same name would be introduced in the declaration > phase if it's used widely in the context OR replace it on the spot if it's > only used once. No semantic changes. > > Signed-off-by: Like Xu CCing s390 maintainers. Any objections to merging this through the Machine Core tree? > --- > hw/s390x/s390-virtio-ccw.c | 3 ++- > hw/s390x/sclp.c | 2 +- > target/s390x/cpu.c | 3 +++ > target/s390x/excp_helper.c | 5 +++++ > 4 files changed, 11 insertions(+), 2 deletions(-) > > diff --git a/hw/s390x/s390-virtio-ccw.c b/hw/s390x/s390-virtio-ccw.c > index ed1fe7a93e..692ad6e372 100644 > --- a/hw/s390x/s390-virtio-ccw.c > +++ b/hw/s390x/s390-virtio-ccw.c > @@ -83,7 +83,7 @@ static void s390_init_cpus(MachineState *machine) > /* initialize possible_cpus */ > mc->possible_cpu_arch_ids(machine); > > - for (i = 0; i < smp_cpus; i++) { > + for (i = 0; i < machine->smp.cpus; i++) { > s390x_new_cpu(machine->cpu_type, i, &error_fatal); > } > } > @@ -410,6 +410,7 @@ static CpuInstanceProperties s390_cpu_index_to_props(MachineState *ms, > static const CPUArchIdList *s390_possible_cpu_arch_ids(MachineState *ms) > { > int i; > + unsigned int max_cpus = ms->smp.max_cpus; > > if (ms->possible_cpus) { > g_assert(ms->possible_cpus && ms->possible_cpus->len == max_cpus); > diff --git a/hw/s390x/sclp.c b/hw/s390x/sclp.c > index 4510a800cb..fac7c3bb6c 100644 > --- a/hw/s390x/sclp.c > +++ b/hw/s390x/sclp.c > @@ -64,7 +64,7 @@ static void read_SCP_info(SCLPDevice *sclp, SCCB *sccb) > prepare_cpu_entries(sclp, read_info->entries, &cpu_count); > read_info->entries_cpu = cpu_to_be16(cpu_count); > read_info->offset_cpu = cpu_to_be16(offsetof(ReadInfo, entries)); > - read_info->highest_cpu = cpu_to_be16(max_cpus - 1); > + read_info->highest_cpu = cpu_to_be16(machine->smp.max_cpus - 1); > > read_info->ibc_val = cpu_to_be32(s390_get_ibc_val()); > > diff --git a/target/s390x/cpu.c b/target/s390x/cpu.c > index b1df63d82c..f1e5c0d9c3 100644 > --- a/target/s390x/cpu.c > +++ b/target/s390x/cpu.c > @@ -37,6 +37,7 @@ > #include "hw/qdev-properties.h" > #ifndef CONFIG_USER_ONLY > #include "hw/hw.h" > +#include "hw/boards.h" > #include "sysemu/arch_init.h" > #include "sysemu/sysemu.h" > #endif > @@ -193,6 +194,8 @@ static void s390_cpu_realizefn(DeviceState *dev, Error **errp) > } > > #if !defined(CONFIG_USER_ONLY) > + MachineState *ms = MACHINE(qdev_get_machine()); > + unsigned int max_cpus = ms->smp.max_cpus; > if (cpu->env.core_id >= max_cpus) { > error_setg(&err, "Unable to add CPU with core-id: %" PRIu32 > ", maximum core-id: %d", cpu->env.core_id, > diff --git a/target/s390x/excp_helper.c b/target/s390x/excp_helper.c > index 3a467b72c5..1c6938effc 100644 > --- a/target/s390x/excp_helper.c > +++ b/target/s390x/excp_helper.c > @@ -31,6 +31,7 @@ > #ifndef CONFIG_USER_ONLY > #include "sysemu/sysemu.h" > #include "hw/s390x/s390_flic.h" > +#include "hw/boards.h" > #endif > > void QEMU_NORETURN tcg_s390_program_interrupt(CPUS390XState *env, uint32_t code, > @@ -300,6 +301,10 @@ static void do_ext_interrupt(CPUS390XState *env) > g_assert(cpu_addr < S390_MAX_CPUS); > lowcore->cpu_addr = cpu_to_be16(cpu_addr); > clear_bit(cpu_addr, env->emergency_signals); > +#ifndef CONFIG_USER_ONLY > + MachineState *ms = MACHINE(qdev_get_machine()); > + unsigned int max_cpus = ms->smp.max_cpus; > +#endif > if (bitmap_empty(env->emergency_signals, max_cpus)) { > env->pending_int &= ~INTERRUPT_EMERGENCY_SIGNAL; > } > -- > 2.21.0 > > -- Eduardo From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-7.0 required=3.0 tests=HEADER_FROM_DIFFERENT_DOMAINS, INCLUDES_PATCH,MAILING_LIST_MULTI,SIGNED_OFF_BY,SPF_HELO_NONE,SPF_PASS, URIBL_BLOCKED autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 583E2C28CC5 for ; Thu, 6 Jun 2019 02:58:41 +0000 (UTC) Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id 34560206B8 for ; Thu, 6 Jun 2019 02:58:41 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 34560206B8 Authentication-Results: mail.kernel.org; dmarc=fail (p=none dis=none) header.from=redhat.com Authentication-Results: mail.kernel.org; spf=pass smtp.mailfrom=qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org Received: from localhost ([127.0.0.1]:53369 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1hYibw-0005B9-Gz for qemu-devel@archiver.kernel.org; Wed, 05 Jun 2019 22:58:40 -0400 Received: from eggs.gnu.org ([209.51.188.92]:53504) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1hYia3-0003qz-Jk for qemu-devel@nongnu.org; Wed, 05 Jun 2019 22:56:44 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1hYia2-0003Ti-Fg for qemu-devel@nongnu.org; Wed, 05 Jun 2019 22:56:43 -0400 Received: from mx1.redhat.com ([209.132.183.28]:42420) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1hYia2-0003S2-71; Wed, 05 Jun 2019 22:56:42 -0400 Received: from smtp.corp.redhat.com (int-mx06.intmail.prod.int.phx2.redhat.com [10.5.11.16]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id 3D065300415C; Thu, 6 Jun 2019 02:56:39 +0000 (UTC) Received: from localhost (ovpn-116-9.gru2.redhat.com [10.97.116.9]) by smtp.corp.redhat.com (Postfix) with ESMTP id 97088518E2; Thu, 6 Jun 2019 02:56:36 +0000 (UTC) Date: Wed, 5 Jun 2019 23:56:35 -0300 From: Eduardo Habkost To: Like Xu Message-ID: <20190606025635.GO22416@habkost.net> References: <20190518205428.90532-1-like.xu@linux.intel.com> <20190518205428.90532-7-like.xu@linux.intel.com> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <20190518205428.90532-7-like.xu@linux.intel.com> X-Scanned-By: MIMEDefang 2.79 on 10.5.11.16 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.46]); Thu, 06 Jun 2019 02:56:39 +0000 (UTC) X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] X-Received-From: 209.132.183.28 Subject: Re: [Qemu-devel] [PATCH v3 06/10] hw/s390x: Replace global smp variables with machine smp properties X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Peter Maydell , David Hildenbrand , qemu-trivial@nongnu.org, Cornelia Huck , qemu-devel@nongnu.org, "Dr . David Alan Gilbert" , Halil Pasic , Christian Borntraeger , qemu-s390x@nongnu.org, Alistair Francis , Igor Mammedov , Richard Henderson Errors-To: qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org Sender: "Qemu-devel" On Sun, May 19, 2019 at 04:54:24AM +0800, Like Xu wrote: > The global smp variables in s390x are replaced with smp machine properties. > > A local variable of the same name would be introduced in the declaration > phase if it's used widely in the context OR replace it on the spot if it's > only used once. No semantic changes. > > Signed-off-by: Like Xu CCing s390 maintainers. Any objections to merging this through the Machine Core tree? > --- > hw/s390x/s390-virtio-ccw.c | 3 ++- > hw/s390x/sclp.c | 2 +- > target/s390x/cpu.c | 3 +++ > target/s390x/excp_helper.c | 5 +++++ > 4 files changed, 11 insertions(+), 2 deletions(-) > > diff --git a/hw/s390x/s390-virtio-ccw.c b/hw/s390x/s390-virtio-ccw.c > index ed1fe7a93e..692ad6e372 100644 > --- a/hw/s390x/s390-virtio-ccw.c > +++ b/hw/s390x/s390-virtio-ccw.c > @@ -83,7 +83,7 @@ static void s390_init_cpus(MachineState *machine) > /* initialize possible_cpus */ > mc->possible_cpu_arch_ids(machine); > > - for (i = 0; i < smp_cpus; i++) { > + for (i = 0; i < machine->smp.cpus; i++) { > s390x_new_cpu(machine->cpu_type, i, &error_fatal); > } > } > @@ -410,6 +410,7 @@ static CpuInstanceProperties s390_cpu_index_to_props(MachineState *ms, > static const CPUArchIdList *s390_possible_cpu_arch_ids(MachineState *ms) > { > int i; > + unsigned int max_cpus = ms->smp.max_cpus; > > if (ms->possible_cpus) { > g_assert(ms->possible_cpus && ms->possible_cpus->len == max_cpus); > diff --git a/hw/s390x/sclp.c b/hw/s390x/sclp.c > index 4510a800cb..fac7c3bb6c 100644 > --- a/hw/s390x/sclp.c > +++ b/hw/s390x/sclp.c > @@ -64,7 +64,7 @@ static void read_SCP_info(SCLPDevice *sclp, SCCB *sccb) > prepare_cpu_entries(sclp, read_info->entries, &cpu_count); > read_info->entries_cpu = cpu_to_be16(cpu_count); > read_info->offset_cpu = cpu_to_be16(offsetof(ReadInfo, entries)); > - read_info->highest_cpu = cpu_to_be16(max_cpus - 1); > + read_info->highest_cpu = cpu_to_be16(machine->smp.max_cpus - 1); > > read_info->ibc_val = cpu_to_be32(s390_get_ibc_val()); > > diff --git a/target/s390x/cpu.c b/target/s390x/cpu.c > index b1df63d82c..f1e5c0d9c3 100644 > --- a/target/s390x/cpu.c > +++ b/target/s390x/cpu.c > @@ -37,6 +37,7 @@ > #include "hw/qdev-properties.h" > #ifndef CONFIG_USER_ONLY > #include "hw/hw.h" > +#include "hw/boards.h" > #include "sysemu/arch_init.h" > #include "sysemu/sysemu.h" > #endif > @@ -193,6 +194,8 @@ static void s390_cpu_realizefn(DeviceState *dev, Error **errp) > } > > #if !defined(CONFIG_USER_ONLY) > + MachineState *ms = MACHINE(qdev_get_machine()); > + unsigned int max_cpus = ms->smp.max_cpus; > if (cpu->env.core_id >= max_cpus) { > error_setg(&err, "Unable to add CPU with core-id: %" PRIu32 > ", maximum core-id: %d", cpu->env.core_id, > diff --git a/target/s390x/excp_helper.c b/target/s390x/excp_helper.c > index 3a467b72c5..1c6938effc 100644 > --- a/target/s390x/excp_helper.c > +++ b/target/s390x/excp_helper.c > @@ -31,6 +31,7 @@ > #ifndef CONFIG_USER_ONLY > #include "sysemu/sysemu.h" > #include "hw/s390x/s390_flic.h" > +#include "hw/boards.h" > #endif > > void QEMU_NORETURN tcg_s390_program_interrupt(CPUS390XState *env, uint32_t code, > @@ -300,6 +301,10 @@ static void do_ext_interrupt(CPUS390XState *env) > g_assert(cpu_addr < S390_MAX_CPUS); > lowcore->cpu_addr = cpu_to_be16(cpu_addr); > clear_bit(cpu_addr, env->emergency_signals); > +#ifndef CONFIG_USER_ONLY > + MachineState *ms = MACHINE(qdev_get_machine()); > + unsigned int max_cpus = ms->smp.max_cpus; > +#endif > if (bitmap_empty(env->emergency_signals, max_cpus)) { > env->pending_int &= ~INTERRUPT_EMERGENCY_SIGNAL; > } > -- > 2.21.0 > > -- Eduardo