{"id":814998,"url":"http://patchwork.ozlabs.org/api/patches/814998/?format=json","web_url":"http://patchwork.ozlabs.org/project/qemu-devel/patch/20170918160012.4317-4-david@redhat.com/","project":{"id":14,"url":"http://patchwork.ozlabs.org/api/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":"","list_archive_url":"","list_archive_url_format":"","commit_url_format":""},"msgid":"<20170918160012.4317-4-david@redhat.com>","list_archive_url":null,"date":"2017-09-18T15:59:48","name":"[v1,03/27] target/s390x: get rid of next_core_id","commit_ref":null,"pull_url":null,"state":"new","archived":false,"hash":"2116ae552f493999a9d4f958e7ce02e7663bbcb5","submitter":{"id":70402,"url":"http://patchwork.ozlabs.org/api/people/70402/?format=json","name":"David Hildenbrand","email":"david@redhat.com"},"delegate":null,"mbox":"http://patchwork.ozlabs.org/project/qemu-devel/patch/20170918160012.4317-4-david@redhat.com/mbox/","series":[{"id":3672,"url":"http://patchwork.ozlabs.org/api/series/3672/?format=json","web_url":"http://patchwork.ozlabs.org/project/qemu-devel/list/?series=3672","date":"2017-09-18T15:59:45","name":"s390x: SMP for TCG (+ cleanups)","version":1,"mbox":"http://patchwork.ozlabs.org/series/3672/mbox/"}],"comments":"http://patchwork.ozlabs.org/api/patches/814998/comments/","check":"pending","checks":"http://patchwork.ozlabs.org/api/patches/814998/checks/","tags":{},"related":[],"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-mx04.extmail.prod.ext.phx2.redhat.com;\n\tdmarc=none (p=none dis=none) header.from=redhat.com","ext-mx04.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 3xwrPs37r3z9s78\n\tfor ;\n\tTue, 19 Sep 2017 02:02:57 +1000 (AEST)","from localhost ([::1]:37541 helo=lists.gnu.org)\n\tby lists.gnu.org with esmtp (Exim 4.71) (envelope-from\n\t)\n\tid 1dtyVb-0007oa-FD\n\tfor incoming@patchwork.ozlabs.org; Mon, 18 Sep 2017 12:02:55 -0400","from eggs.gnu.org ([2001:4830:134:3::10]:37268)\n\tby lists.gnu.org with esmtp (Exim 4.71)\n\t(envelope-from ) id 1dtyTl-0006ob-8Q\n\tfor qemu-devel@nongnu.org; Mon, 18 Sep 2017 12:01:11 -0400","from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71)\n\t(envelope-from ) id 1dtyTf-0007l6-JS\n\tfor qemu-devel@nongnu.org; Mon, 18 Sep 2017 12:01:01 -0400","from mx1.redhat.com ([209.132.183.28]:54322)\n\tby eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32)\n\t(Exim 4.71) (envelope-from ) id 1dtyTf-0007kf-BL\n\tfor qemu-devel@nongnu.org; Mon, 18 Sep 2017 12:00:55 -0400","from smtp.corp.redhat.com\n\t(int-mx05.intmail.prod.int.phx2.redhat.com [10.5.11.15])\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 499B77CE0E;\n\tMon, 18 Sep 2017 16:00:54 +0000 (UTC)","from t460s.redhat.com (unknown [10.36.118.72])\n\tby smtp.corp.redhat.com (Postfix) with ESMTP id 652875D6A8;\n\tMon, 18 Sep 2017 16:00:51 +0000 (UTC)"],"DMARC-Filter":"OpenDMARC Filter v1.3.2 mx1.redhat.com 499B77CE0E","From":"David Hildenbrand ","To":"qemu-devel@nongnu.org","Date":"Mon, 18 Sep 2017 17:59:48 +0200","Message-Id":"<20170918160012.4317-4-david@redhat.com>","In-Reply-To":"<20170918160012.4317-1-david@redhat.com>","References":"<20170918160012.4317-1-david@redhat.com>","X-Scanned-By":"MIMEDefang 2.79 on 10.5.11.15","X-Greylist":"Sender IP whitelisted, not delayed by milter-greylist-4.5.16\n\t(mx1.redhat.com [10.5.110.28]);\n\tMon, 18 Sep 2017 16:00:54 +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 03/27] target/s390x: get rid of next_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":"Matthew Rosato , thuth@redhat.com,\n\tdavid@redhat.com, cohuck@redhat.com, Richard Henderson\n\t, Alexander Graf ,\n\tborntraeger@de.ibm.com, \tIgor Mammedov ,\n\t=?utf-8?q?Alex_Benn=C3=A9e?= ,\n\tAurelien Jarno ","Errors-To":"qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org","Sender":"\"Qemu-devel\"\n\t"},"content":"core_id is not needed by linux-user, as the core_id a.k.a. CPU address\nis only accessible from kernel space.\n\nTherefore, drop next_core_id and make cpu_index get autoassigned again\nfor linux-user.\n\nWhile at it, shield core_id and cpuid completely from linux-user. cpuid\ncan also only be queried from kernel space.\n\nSuggested-by: Igor Mammedov \nSigned-off-by: David Hildenbrand \n---\n target/s390x/cpu-qom.h | 2 --\n target/s390x/cpu.c | 14 +++++++-------\n target/s390x/cpu.h | 2 ++\n target/s390x/cpu_models.c | 2 ++\n 4 files changed, 11 insertions(+), 9 deletions(-)","diff":"diff --git a/target/s390x/cpu-qom.h b/target/s390x/cpu-qom.h\nindex 2e446fab51..0510c49e07 100644\n--- a/target/s390x/cpu-qom.h\n+++ b/target/s390x/cpu-qom.h\n@@ -54,8 +54,6 @@ typedef struct S390CPUClass {\n bool is_migration_safe;\n const char *desc;\n \n- uint32_t next_core_id;\n-\n DeviceRealize parent_realize;\n void (*parent_reset)(CPUState *cpu);\n void (*load_normal)(CPUState *cpu);\ndiff --git a/target/s390x/cpu.c b/target/s390x/cpu.c\nindex 4920da3625..f42e28ea25 100644\n--- a/target/s390x/cpu.c\n+++ b/target/s390x/cpu.c\n@@ -178,8 +178,9 @@ static void s390_cpu_realizefn(DeviceState *dev, Error **errp)\n {\n CPUState *cs = CPU(dev);\n S390CPUClass *scc = S390_CPU_GET_CLASS(dev);\n+#if !defined(CONFIG_USER_ONLY)\n S390CPU *cpu = S390_CPU(dev);\n- CPUS390XState *env = &cpu->env;\n+#endif\n Error *err = NULL;\n \n /* the model has to be realized before qemu_init_vcpu() due to kvm */\n@@ -195,11 +196,6 @@ static void s390_cpu_realizefn(DeviceState *dev, Error **errp)\n max_cpus - 1);\n goto out;\n }\n-#else\n- /* implicitly set for linux-user only */\n- cpu->env.core_id = scc->next_core_id;\n- scc->next_core_id++;\n-#endif\n \n if (cpu_exists(cpu->env.core_id)) {\n error_setg(&err, \"Unable to add CPU with core-id: %\" PRIu32\n@@ -208,7 +204,9 @@ static void s390_cpu_realizefn(DeviceState *dev, Error **errp)\n }\n \n /* sync cs->cpu_index and env->core_id. The latter is needed for TCG. */\n- cs->cpu_index = env->core_id;\n+ cs->cpu_index = cpu->env.core_id;\n+#endif\n+\n cpu_exec_realizefn(cs, &err);\n if (err != NULL) {\n goto out;\n@@ -440,7 +438,9 @@ static gchar *s390_gdb_arch_name(CPUState *cs)\n }\n \n static Property s390x_cpu_properties[] = {\n+#if !defined(CONFIG_USER_ONLY)\n DEFINE_PROP_UINT32(\"core-id\", S390CPU, env.core_id, 0),\n+#endif\n DEFINE_PROP_END_OF_LIST()\n };\n \ndiff --git a/target/s390x/cpu.h b/target/s390x/cpu.h\nindex 9b549dc491..f13aea3dd8 100644\n--- a/target/s390x/cpu.h\n+++ b/target/s390x/cpu.h\n@@ -150,8 +150,10 @@ struct CPUS390XState {\n \n CPU_COMMON\n \n+#if !defined(CONFIG_USER_ONLY)\n uint32_t core_id; /* PoP \"CPU address\", same as cpu_index */\n uint64_t cpuid;\n+#endif\n \n uint64_t tod_offset;\n uint64_t tod_basetime;\ndiff --git a/target/s390x/cpu_models.c b/target/s390x/cpu_models.c\nindex 5169379db5..191aee6dd4 100644\n--- a/target/s390x/cpu_models.c\n+++ b/target/s390x/cpu_models.c\n@@ -941,11 +941,13 @@ void s390_realize_cpu_model(CPUState *cs, Error **errp)\n \n apply_cpu_model(cpu->model, errp);\n \n+#if !defined(CONFIG_USER_ONLY)\n cpu->env.cpuid = s390_cpuid_from_cpu_model(cpu->model);\n if (tcg_enabled()) {\n /* basic mode, write the cpu address into the first 4 bit of the ID */\n cpu->env.cpuid = deposit64(cpu->env.cpuid, 54, 4, cpu->env.core_id);\n }\n+#endif\n }\n \n static void get_feature(Object *obj, Visitor *v, const char *name,\n","prefixes":["v1","03/27"]}