{"id":809746,"url":"http://patchwork.ozlabs.org/api/1.0/patches/809746/?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-13-david@redhat.com>","date":"2017-09-04T15:43:09","name":"[v2,12/19] target/s390x: set cpu->id for linux user when realizing","commit_ref":null,"pull_url":null,"state":"new","archived":false,"hash":"3ff8e61ce09563669f32751b034e8db617effbb2","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-13-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/809746/checks/","tags":{},"headers":{"Return-Path":"<qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org>","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=<UNKNOWN>)","ext-mx01.extmail.prod.ext.phx2.redhat.com;\n\tdmarc=none (p=none dis=none) header.from=redhat.com","ext-mx01.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 3xmDw22K77z9sNq\n\tfor <incoming@patchwork.ozlabs.org>;\n\tTue,  5 Sep 2017 01:55:46 +1000 (AEST)","from localhost ([::1]:54550 helo=lists.gnu.org)\n\tby lists.gnu.org with esmtp (Exim 4.71) (envelope-from\n\t<qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org>)\n\tid 1dotiy-0005b7-Ea\n\tfor incoming@patchwork.ozlabs.org; Mon, 04 Sep 2017 11:55:44 -0400","from eggs.gnu.org ([2001:4830:134:3::10]:37753)\n\tby lists.gnu.org with esmtp (Exim 4.71)\n\t(envelope-from <david@redhat.com>) id 1dotXa-0004hO-Oa\n\tfor qemu-devel@nongnu.org; Mon, 04 Sep 2017 11:44:03 -0400","from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71)\n\t(envelope-from <david@redhat.com>) id 1dotXW-00019U-6u\n\tfor qemu-devel@nongnu.org; Mon, 04 Sep 2017 11:43:58 -0400","from mx1.redhat.com ([209.132.183.28]:35744)\n\tby eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32)\n\t(Exim 4.71) (envelope-from <david@redhat.com>) id 1dotXW-00018b-0Y\n\tfor qemu-devel@nongnu.org; Mon, 04 Sep 2017 11:43:54 -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 0555772F1A;\n\tMon,  4 Sep 2017 15:43:53 +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 899BF11CC33;\n\tMon,  4 Sep 2017 15:43:49 +0000 (UTC)"],"DMARC-Filter":"OpenDMARC Filter v1.3.2 mx1.redhat.com 0555772F1A","From":"David Hildenbrand <david@redhat.com>","To":"qemu-devel@nongnu.org","Date":"Mon,  4 Sep 2017 17:43:09 +0200","Message-Id":"<20170904154316.4148-13-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.25]);\n\tMon, 04 Sep 2017 15:43:53 +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 12/19] target/s390x: set cpu->id for linux\n\tuser when realizing","X-BeenThere":"qemu-devel@nongnu.org","X-Mailman-Version":"2.1.21","Precedence":"list","List-Id":"<qemu-devel.nongnu.org>","List-Unsubscribe":"<https://lists.nongnu.org/mailman/options/qemu-devel>,\n\t<mailto:qemu-devel-request@nongnu.org?subject=unsubscribe>","List-Archive":"<http://lists.nongnu.org/archive/html/qemu-devel/>","List-Post":"<mailto:qemu-devel@nongnu.org>","List-Help":"<mailto:qemu-devel-request@nongnu.org?subject=help>","List-Subscribe":"<https://lists.nongnu.org/mailman/listinfo/qemu-devel>,\n\t<mailto:qemu-devel-request@nongnu.org?subject=subscribe>","Cc":"thuth@redhat.com, Eduardo Habkost <ehabkost@redhat.com>, david@redhat.com,\n\tcohuck@redhat.com, Richard Henderson <richard.henderson@linaro.org>, \n\tAlexander Graf <agraf@suse.de>, borntraeger@de.ibm.com","Errors-To":"qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org","Sender":"\"Qemu-devel\"\n\t<qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org>"},"content":"scc->next_cpu_id is updated when realizing. Setting it just before that\npoint looks cleaner.\n\nSigned-off-by: David Hildenbrand <david@redhat.com>\n---\n target/s390x/cpu.c | 11 ++++-------\n 1 file changed, 4 insertions(+), 7 deletions(-)","diff":"diff --git a/target/s390x/cpu.c b/target/s390x/cpu.c\nindex 74b3e4fd0d..5f9315fb16 100644\n--- a/target/s390x/cpu.c\n+++ b/target/s390x/cpu.c\n@@ -194,7 +194,11 @@ static void s390_cpu_realizefn(DeviceState *dev, Error **errp)\n                    \", max allowed: %d\", cpu->id, max_cpus - 1);\n         goto out;\n     }\n+#else\n+    /* implicitly set for linux-user only */\n+    cpu->id = scc->next_cpu_id;\n #endif\n+\n     if (cpu_exists(cpu->id)) {\n         error_setg(&err, \"Unable to add CPU: %\" PRIi64\n                    \", it already exists\", cpu->id);\n@@ -306,13 +310,6 @@ static void s390_cpu_initfn(Object *obj)\n         inited = true;\n         s390x_translate_init();\n     }\n-\n-#if defined(CONFIG_USER_ONLY)\n-    {\n-        S390CPUClass *scc = S390_CPU_GET_CLASS(obj);\n-        cpu->id = scc->next_cpu_id;\n-    }\n-#endif\n }\n \n static void s390_cpu_finalize(Object *obj)\n","prefixes":["v2","12/19"]}