{"id":809748,"url":"http://patchwork.ozlabs.org/api/1.0/patches/809748/?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":"<20170904154316.4148-15-david@redhat.com>","date":"2017-09-04T15:43:11","name":"[v2,14/19] target/s390x: rename next_cpu_id to next_core_id","commit_ref":null,"pull_url":null,"state":"new","archived":false,"hash":"0a70a463a37400a886e24fb9b90fcbda42803e49","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/20170904154316.4148-15-david@redhat.com/mbox/","series":[{"id":1412,"url":"http://patchwork.ozlabs.org/api/1.0/series/1412/?format=json","date":"2017-09-04T15:42:57","name":"s390x cleanups and CPU hotplug via device_add","version":2,"mbox":"http://patchwork.ozlabs.org/series/1412/mbox/"}],"check":"pending","checks":"http://patchwork.ozlabs.org/api/patches/809748/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-mx07.extmail.prod.ext.phx2.redhat.com;\n\tdmarc=none (p=none dis=none) header.from=redhat.com","ext-mx07.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 3xmDy021pxz9sNq\n\tfor ;\n\tTue, 5 Sep 2017 01:57:28 +1000 (AEST)","from localhost ([::1]:54553 helo=lists.gnu.org)\n\tby lists.gnu.org with esmtp (Exim 4.71) (envelope-from\n\t)\n\tid 1dotkc-0006k0-E2\n\tfor incoming@patchwork.ozlabs.org; Mon, 04 Sep 2017 11:57:26 -0400","from eggs.gnu.org ([2001:4830:134:3::10]:37828)\n\tby lists.gnu.org with esmtp (Exim 4.71)\n\t(envelope-from ) id 1dotXi-0004mN-1j\n\tfor qemu-devel@nongnu.org; Mon, 04 Sep 2017 11:44:10 -0400","from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71)\n\t(envelope-from ) id 1dotXd-0001G7-E8\n\tfor qemu-devel@nongnu.org; Mon, 04 Sep 2017 11:44:06 -0400","from mx1.redhat.com ([209.132.183.28]:40202)\n\tby eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32)\n\t(Exim 4.71) (envelope-from ) id 1dotXd-0001FB-7z\n\tfor qemu-devel@nongnu.org; Mon, 04 Sep 2017 11:44:01 -0400","from smtp.corp.redhat.com\n\t(int-mx03.intmail.prod.int.phx2.redhat.com [10.5.11.13])\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 4B811C29B5F4;\n\tMon, 4 Sep 2017 15:44:00 +0000 (UTC)","from t460s.redhat.com (ovpn-116-139.ams2.redhat.com\n\t[10.36.116.139])\n\tby smtp.corp.redhat.com (Postfix) with ESMTP id 4CE66C14C4;\n\tMon, 4 Sep 2017 15:43:58 +0000 (UTC)"],"DMARC-Filter":"OpenDMARC Filter v1.3.2 mx1.redhat.com 4B811C29B5F4","From":"David Hildenbrand ","To":"qemu-devel@nongnu.org","Date":"Mon, 4 Sep 2017 17:43:11 +0200","Message-Id":"<20170904154316.4148-15-david@redhat.com>","In-Reply-To":"<20170904154316.4148-1-david@redhat.com>","References":"<20170904154316.4148-1-david@redhat.com>","X-Scanned-By":"MIMEDefang 2.79 on 10.5.11.13","X-Greylist":"Sender IP whitelisted, not delayed by milter-greylist-4.5.16\n\t(mx1.redhat.com [10.5.110.31]);\n\tMon, 04 Sep 2017 15:44:00 +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 v2 14/19] target/s390x: rename next_cpu_id to\n\tnext_core_id","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, Eduardo Habkost , david@redhat.com,\n\tcohuck@redhat.com, Richard Henderson , \n\tAlexander Graf , borntraeger@de.ibm.com","Errors-To":"qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org","Sender":"\"Qemu-devel\"\n\t"},"content":"Adapt to the new term \"core_id\". 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 | 11 +++++------\n 2 files changed, 6 insertions(+), 7 deletions(-)","diff":"diff --git a/target/s390x/cpu-qom.h b/target/s390x/cpu-qom.h\nindex c8fbf8ae03..21ea15e642 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_core_id;\n \n DeviceRealize parent_realize;\n void (*parent_reset)(CPUState *cpu);\ndiff --git a/target/s390x/cpu.c b/target/s390x/cpu.c\nindex a2570bbc6b..105ff13034 100644\n--- a/target/s390x/cpu.c\n+++ b/target/s390x/cpu.c\n@@ -197,7 +197,7 @@ static void s390_cpu_realizefn(DeviceState *dev, Error **errp)\n }\n #else\n /* implicitly set for linux-user only */\n- cpu->env.core_id = scc->next_cpu_id;\n+ cpu->env.core_id = scc->next_core_id;\n #endif\n \n if (cpu_exists(cpu->env.core_id)) {\n@@ -205,10 +205,10 @@ static void s390_cpu_realizefn(DeviceState *dev, Error **errp)\n cpu->env.core_id);\n goto out;\n }\n- if (cpu->env.core_id != scc->next_cpu_id) {\n+ if (cpu->env.core_id != scc->next_core_id) {\n error_setg(&err, \"Unable to add CPU: %\" PRIu32\n- \", the next available nr is %\" PRIi64, cpu->env.core_id,\n- scc->next_cpu_id);\n+ \", the next available id is %\" PRIu32, cpu->env.core_id,\n+ scc->next_core_id);\n goto out;\n }\n \n@@ -218,7 +218,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_core_id++;\n \n #if !defined(CONFIG_USER_ONLY)\n qemu_register_reset(s390_cpu_machine_reset_cb, cpu);\n@@ -463,7 +463,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;\n","prefixes":["v2","14/19"]}