From nobody Tue Nov 4 13:04:41 2025 Delivered-To: importer@patchew.org Received-SPF: pass (zoho.com: domain of gnu.org designates 208.118.235.17 as permitted sender) client-ip=208.118.235.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Authentication-Results: mx.zohomail.com; spf=pass (zoho.com: domain of gnu.org designates 208.118.235.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org Return-Path: Received: from lists.gnu.org (lists.gnu.org [208.118.235.17]) by mx.zohomail.com with SMTPS id 1504115527375974.3062524651864; Wed, 30 Aug 2017 10:52:07 -0700 (PDT) Received: from localhost ([::1]:51926 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1dn79p-0005yK-Ih for importer@patchew.org; Wed, 30 Aug 2017 13:52:05 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:33428) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1dn6Rs-0005p3-IJ for qemu-devel@nongnu.org; Wed, 30 Aug 2017 13:06:41 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1dn6Rr-0002V8-MH for qemu-devel@nongnu.org; Wed, 30 Aug 2017 13:06:40 -0400 Received: from mx1.redhat.com ([209.132.183.28]:41366) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1dn6Rr-0002Ut-DT for qemu-devel@nongnu.org; Wed, 30 Aug 2017 13:06:39 -0400 Received: from smtp.corp.redhat.com (int-mx02.intmail.prod.int.phx2.redhat.com [10.5.11.12]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id 70518806B1; Wed, 30 Aug 2017 17:06:38 +0000 (UTC) Received: from t460s.redhat.com (ovpn-116-98.ams2.redhat.com [10.36.116.98]) by smtp.corp.redhat.com (Postfix) with ESMTP id 9BB189B518; Wed, 30 Aug 2017 17:06:32 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mx1.redhat.com 70518806B1 Authentication-Results: ext-mx02.extmail.prod.ext.phx2.redhat.com; dmarc=none (p=none dis=none) header.from=redhat.com Authentication-Results: ext-mx02.extmail.prod.ext.phx2.redhat.com; spf=fail smtp.mailfrom=david@redhat.com From: David Hildenbrand To: qemu-devel@nongnu.org Date: Wed, 30 Aug 2017 19:05:57 +0200 Message-Id: <20170830170601.15855-8-david@redhat.com> In-Reply-To: <20170830170601.15855-1-david@redhat.com> References: <20170830170601.15855-1-david@redhat.com> X-Scanned-By: MIMEDefang 2.79 on 10.5.11.12 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.26]); Wed, 30 Aug 2017 17:06:38 +0000 (UTC) X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] [fuzzy] X-Received-From: 209.132.183.28 Subject: [Qemu-devel] [PATCH v1 07/11] target/s390x: rename next_cpu_id to next_cpu_addr 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: thuth@redhat.com, david@redhat.com, cohuck@redhat.com, Richard Henderson , Alexander Graf , borntraeger@de.ibm.com, Aurelien Jarno Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail: RSF_0 Z_629925259 SPT_0 Content-Transfer-Encoding: quoted-printable MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Adapt the term address/adddr. While at it, fix the type and drop the initialization to 0 (which is superfluous). Signed-off-by: David Hildenbrand --- target/s390x/cpu-qom.h | 2 +- target/s390x/cpu.c | 9 ++++----- target/s390x/helper.c | 4 ++-- 3 files changed, 7 insertions(+), 8 deletions(-) diff --git a/target/s390x/cpu-qom.h b/target/s390x/cpu-qom.h index 4e936e7788..a3a3ada226 100644 --- a/target/s390x/cpu-qom.h +++ b/target/s390x/cpu-qom.h @@ -52,7 +52,7 @@ typedef struct S390CPUClass { bool is_migration_safe; const char *desc; =20 - int64_t next_cpu_id; + uint32_t next_cpu_addr; =20 DeviceRealize parent_realize; void (*parent_reset)(CPUState *cpu); diff --git a/target/s390x/cpu.c b/target/s390x/cpu.c index 156589e921..ffc1ff9a2b 100644 --- a/target/s390x/cpu.c +++ b/target/s390x/cpu.c @@ -201,10 +201,10 @@ static void s390_cpu_realizefn(DeviceState *dev, Erro= r **errp) cpu->env.cpu_addr); goto out; } - if (cpu->env.cpu_addr !=3D scc->next_cpu_id) { + if (cpu->env.cpu_addr !=3D scc->next_cpu_addr) { error_setg(&err, "Unable to add CPU: %" PRIu32 - ", the next available nr is %" PRIi64, cpu->env.cpu_add= r, - scc->next_cpu_id); + ", the next available addr is %" PRIu32, cpu->env.cpu_a= ddr, + scc->next_cpu_addr); goto out; } =20 @@ -214,7 +214,7 @@ static void s390_cpu_realizefn(DeviceState *dev, Error = **errp) if (err !=3D NULL) { goto out; } - scc->next_cpu_id++; + scc->next_cpu_addr++; =20 #if !defined(CONFIG_USER_ONLY) qemu_register_reset(s390_cpu_machine_reset_cb, cpu); @@ -459,7 +459,6 @@ static void s390_cpu_class_init(ObjectClass *oc, void *= data) CPUClass *cc =3D CPU_CLASS(scc); DeviceClass *dc =3D DEVICE_CLASS(oc); =20 - scc->next_cpu_id =3D 0; scc->parent_realize =3D dc->realize; dc->realize =3D s390_cpu_realizefn; dc->props =3D s390x_cpu_properties; diff --git a/target/s390x/helper.c b/target/s390x/helper.c index 70d1ea8cf6..d8f198cf6f 100644 --- a/target/s390x/helper.c +++ b/target/s390x/helper.c @@ -134,9 +134,9 @@ S390CPU *cpu_s390x_init(const char *cpu_model) Error *err =3D NULL; S390CPU *cpu; /* Use to track CPU ID for linux-user only */ - static int64_t next_cpu_id; + static uint32_t next_cpu_addr; =20 - cpu =3D s390x_new_cpu(cpu_model, next_cpu_id++, &err); + cpu =3D s390x_new_cpu(cpu_model, next_cpu_addr++, &err); if (err) { error_report_err(err); } --=20 2.13.5