{"id":807821,"url":"http://patchwork.ozlabs.org/api/1.0/patches/807821/?format=json","project":{"id":14,"url":"http://patchwork.ozlabs.org/api/1.0/projects/14/?format=json","name":"QEMU Development","link_name":"qemu-devel","list_id":"qemu-devel.nongnu.org","list_email":"qemu-devel@nongnu.org","web_url":"","scm_url":"","webscm_url":""},"msgid":"<20170830170601.15855-8-david@redhat.com>","date":"2017-08-30T17:05:57","name":"[v1,07/11] target/s390x: rename next_cpu_id to next_cpu_addr","commit_ref":null,"pull_url":null,"state":"new","archived":false,"hash":"25cd0b7589afd768cdff27fbb7a4f72e5e58377a","submitter":{"id":70402,"url":"http://patchwork.ozlabs.org/api/1.0/people/70402/?format=json","name":"David Hildenbrand","email":"david@redhat.com"},"delegate":null,"mbox":"http://patchwork.ozlabs.org/project/qemu-devel/patch/20170830170601.15855-8-david@redhat.com/mbox/","series":[{"id":666,"url":"http://patchwork.ozlabs.org/api/1.0/series/666/?format=json","date":"2017-08-30T17:06:00","name":"next round of s390x cleanups","version":1,"mbox":"http://patchwork.ozlabs.org/series/666/mbox/"}],"check":"pending","checks":"http://patchwork.ozlabs.org/api/patches/807821/checks/","tags":{},"headers":{"Return-Path":"","X-Original-To":"incoming@patchwork.ozlabs.org","Delivered-To":"patchwork-incoming@bilbo.ozlabs.org","Authentication-Results":["ozlabs.org;\n\tspf=pass (mailfrom) smtp.mailfrom=nongnu.org\n\t(client-ip=2001:4830:134:3::11; helo=lists.gnu.org;\n\tenvelope-from=qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org;\n\treceiver=)","ext-mx02.extmail.prod.ext.phx2.redhat.com;\n\tdmarc=none (p=none dis=none) header.from=redhat.com","ext-mx02.extmail.prod.ext.phx2.redhat.com;\n\tspf=fail smtp.mailfrom=david@redhat.com"],"Received":["from lists.gnu.org (lists.gnu.org [IPv6:2001:4830:134:3::11])\n\t(using TLSv1 with cipher AES256-SHA (256/256 bits))\n\t(No client certificate requested)\n\tby ozlabs.org (Postfix) with ESMTPS id 3xjCjY5TCKz9sN7\n\tfor ;\n\tThu, 31 Aug 2017 03:51:13 +1000 (AEST)","from localhost ([::1]:51921 helo=lists.gnu.org)\n\tby lists.gnu.org with esmtp (Exim 4.71) (envelope-from\n\t)\n\tid 1dn78x-00059O-GH\n\tfor incoming@patchwork.ozlabs.org; Wed, 30 Aug 2017 13:51:11 -0400","from eggs.gnu.org ([2001:4830:134:3::10]:33428)\n\tby lists.gnu.org with esmtp (Exim 4.71)\n\t(envelope-from ) id 1dn6Rs-0005p3-IJ\n\tfor qemu-devel@nongnu.org; Wed, 30 Aug 2017 13:06:41 -0400","from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71)\n\t(envelope-from ) id 1dn6Rr-0002V8-MH\n\tfor qemu-devel@nongnu.org; Wed, 30 Aug 2017 13:06:40 -0400","from mx1.redhat.com ([209.132.183.28]:41366)\n\tby eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32)\n\t(Exim 4.71) (envelope-from ) id 1dn6Rr-0002Ut-DT\n\tfor qemu-devel@nongnu.org; Wed, 30 Aug 2017 13:06:39 -0400","from smtp.corp.redhat.com\n\t(int-mx02.intmail.prod.int.phx2.redhat.com [10.5.11.12])\n\t(using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits))\n\t(No client certificate requested)\n\tby mx1.redhat.com (Postfix) with ESMTPS id 70518806B1;\n\tWed, 30 Aug 2017 17:06:38 +0000 (UTC)","from t460s.redhat.com (ovpn-116-98.ams2.redhat.com [10.36.116.98])\n\tby smtp.corp.redhat.com (Postfix) with ESMTP id 9BB189B518;\n\tWed, 30 Aug 2017 17:06:32 +0000 (UTC)"],"DMARC-Filter":"OpenDMARC Filter v1.3.2 mx1.redhat.com 70518806B1","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\n\t(mx1.redhat.com [10.5.110.26]);\n\tWed, 30 Aug 2017 17:06:38 +0000 (UTC)","X-detected-operating-system":"by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic]\n\t[fuzzy]","X-Received-From":"209.132.183.28","Subject":"[Qemu-devel] [PATCH v1 07/11] target/s390x: rename next_cpu_id to\n\tnext_cpu_addr","X-BeenThere":"qemu-devel@nongnu.org","X-Mailman-Version":"2.1.21","Precedence":"list","List-Id":"","List-Unsubscribe":",\n\t","List-Archive":"","List-Post":"","List-Help":"","List-Subscribe":",\n\t","Cc":"thuth@redhat.com, david@redhat.com, cohuck@redhat.com,\n\tRichard Henderson ,\n\tAlexander Graf , borntraeger@de.ibm.com,\n\tAurelien Jarno ","Errors-To":"qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org","Sender":"\"Qemu-devel\"\n\t"},"content":"Adapt the term address/adddr. While at it, fix the type and drop the\ninitialization to 0 (which is superfluous).\n\nSigned-off-by: David Hildenbrand \n---\n target/s390x/cpu-qom.h | 2 +-\n target/s390x/cpu.c | 9 ++++-----\n target/s390x/helper.c | 4 ++--\n 3 files changed, 7 insertions(+), 8 deletions(-)","diff":"diff --git a/target/s390x/cpu-qom.h b/target/s390x/cpu-qom.h\nindex 4e936e7788..a3a3ada226 100644\n--- a/target/s390x/cpu-qom.h\n+++ b/target/s390x/cpu-qom.h\n@@ -52,7 +52,7 @@ typedef struct S390CPUClass {\n bool is_migration_safe;\n const char *desc;\n \n- int64_t next_cpu_id;\n+ uint32_t next_cpu_addr;\n \n DeviceRealize parent_realize;\n void (*parent_reset)(CPUState *cpu);\ndiff --git a/target/s390x/cpu.c b/target/s390x/cpu.c\nindex 156589e921..ffc1ff9a2b 100644\n--- a/target/s390x/cpu.c\n+++ b/target/s390x/cpu.c\n@@ -201,10 +201,10 @@ static void s390_cpu_realizefn(DeviceState *dev, Error **errp)\n cpu->env.cpu_addr);\n goto out;\n }\n- if (cpu->env.cpu_addr != scc->next_cpu_id) {\n+ if (cpu->env.cpu_addr != scc->next_cpu_addr) {\n error_setg(&err, \"Unable to add CPU: %\" PRIu32\n- \", the next available nr is %\" PRIi64, cpu->env.cpu_addr,\n- scc->next_cpu_id);\n+ \", the next available addr is %\" PRIu32, cpu->env.cpu_addr,\n+ scc->next_cpu_addr);\n goto out;\n }\n \n@@ -214,7 +214,7 @@ static void s390_cpu_realizefn(DeviceState *dev, Error **errp)\n if (err != NULL) {\n goto out;\n }\n- scc->next_cpu_id++;\n+ scc->next_cpu_addr++;\n \n #if !defined(CONFIG_USER_ONLY)\n qemu_register_reset(s390_cpu_machine_reset_cb, cpu);\n@@ -459,7 +459,6 @@ static void s390_cpu_class_init(ObjectClass *oc, void *data)\n CPUClass *cc = CPU_CLASS(scc);\n DeviceClass *dc = DEVICE_CLASS(oc);\n \n- scc->next_cpu_id = 0;\n scc->parent_realize = dc->realize;\n dc->realize = s390_cpu_realizefn;\n dc->props = s390x_cpu_properties;\ndiff --git a/target/s390x/helper.c b/target/s390x/helper.c\nindex 70d1ea8cf6..d8f198cf6f 100644\n--- a/target/s390x/helper.c\n+++ b/target/s390x/helper.c\n@@ -134,9 +134,9 @@ S390CPU *cpu_s390x_init(const char *cpu_model)\n Error *err = NULL;\n S390CPU *cpu;\n /* Use to track CPU ID for linux-user only */\n- static int64_t next_cpu_id;\n+ static uint32_t next_cpu_addr;\n \n- cpu = s390x_new_cpu(cpu_model, next_cpu_id++, &err);\n+ cpu = s390x_new_cpu(cpu_model, next_cpu_addr++, &err);\n if (err) {\n error_report_err(err);\n }\n","prefixes":["v1","07/11"]}