{"id":811155,"url":"http://patchwork.ozlabs.org/api/patches/811155/?format=json","web_url":"http://patchwork.ozlabs.org/project/qemu-devel/patch/20170907201335.13956-21-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":"<20170907201335.13956-21-david@redhat.com>","list_archive_url":null,"date":"2017-09-07T20:13:34","name":"[v3,20/21] s390x: generate sclp cpu information from possible_cpus","commit_ref":null,"pull_url":null,"state":"new","archived":false,"hash":"2b5996d4ca4843a305d155bf68f111679f129e2d","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/20170907201335.13956-21-david@redhat.com/mbox/","series":[{"id":2053,"url":"http://patchwork.ozlabs.org/api/series/2053/?format=json","web_url":"http://patchwork.ozlabs.org/project/qemu-devel/list/?series=2053","date":"2017-09-07T20:13:14","name":"s390x cleanups and CPU hotplug via device_add","version":3,"mbox":"http://patchwork.ozlabs.org/series/2053/mbox/"}],"comments":"http://patchwork.ozlabs.org/api/patches/811155/comments/","check":"pending","checks":"http://patchwork.ozlabs.org/api/patches/811155/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-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 3xpBmC5846z9sQl\n\tfor ;\n\tFri, 8 Sep 2017 06:25:47 +1000 (AEST)","from localhost ([::1]:42146 helo=lists.gnu.org)\n\tby lists.gnu.org with esmtp (Exim 4.71) (envelope-from\n\t)\n\tid 1dq3Mv-0005eS-NZ\n\tfor incoming@patchwork.ozlabs.org; Thu, 07 Sep 2017 16:25:45 -0400","from eggs.gnu.org ([2001:4830:134:3::10]:39268)\n\tby lists.gnu.org with esmtp (Exim 4.71)\n\t(envelope-from ) id 1dq3CN-0004kC-11\n\tfor qemu-devel@nongnu.org; Thu, 07 Sep 2017 16:14:55 -0400","from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71)\n\t(envelope-from ) id 1dq3CI-0002Y6-6u\n\tfor qemu-devel@nongnu.org; Thu, 07 Sep 2017 16:14:50 -0400","from mx1.redhat.com ([209.132.183.28]:53862)\n\tby eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32)\n\t(Exim 4.71) (envelope-from ) id 1dq3CH-0002Xm-Ue\n\tfor qemu-devel@nongnu.org; Thu, 07 Sep 2017 16:14:46 -0400","from smtp.corp.redhat.com\n\t(int-mx06.intmail.prod.int.phx2.redhat.com [10.5.11.16])\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 EB388883B4;\n\tThu, 7 Sep 2017 20:14:44 +0000 (UTC)","from t460s.redhat.com (ovpn-116-60.ams2.redhat.com [10.36.116.60])\n\tby smtp.corp.redhat.com (Postfix) with ESMTP id D25BF68D48;\n\tThu, 7 Sep 2017 20:14:42 +0000 (UTC)"],"DMARC-Filter":"OpenDMARC Filter v1.3.2 mx1.redhat.com EB388883B4","From":"David Hildenbrand ","To":"qemu-devel@nongnu.org","Date":"Thu, 7 Sep 2017 22:13:34 +0200","Message-Id":"<20170907201335.13956-21-david@redhat.com>","In-Reply-To":"<20170907201335.13956-1-david@redhat.com>","References":"<20170907201335.13956-1-david@redhat.com>","X-Scanned-By":"MIMEDefang 2.79 on 10.5.11.16","X-Greylist":"Sender IP whitelisted, not delayed by milter-greylist-4.5.16\n\t(mx1.redhat.com [10.5.110.26]);\n\tThu, 07 Sep 2017 20:14:45 +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 v3 20/21] s390x: generate sclp cpu information\n\tfrom possible_cpus","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\tEduardo 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":"This is the first step to allow hot plugging of CPUs in a non-sequential\norder. If a cpu is available (\"plugged\") can directly be decided by\nlooking at the cpu state pointer.\n\nThis makes sure, that really only cpus attached to the machine are\nreported.\n\nSigned-off-by: David Hildenbrand \n---\n hw/s390x/sclp.c | 34 ++++++++++++++--------------------\n 1 file changed, 14 insertions(+), 20 deletions(-)","diff":"diff --git a/hw/s390x/sclp.c b/hw/s390x/sclp.c\nindex fd097262c7..30aefbfd15 100644\n--- a/hw/s390x/sclp.c\n+++ b/hw/s390x/sclp.c\n@@ -34,16 +34,21 @@ static inline SCLPDevice *get_sclp_device(void)\n return sclp;\n }\n \n-static void prepare_cpu_entries(SCLPDevice *sclp, CPUEntry *entry, int count)\n+static void prepare_cpu_entries(SCLPDevice *sclp, CPUEntry *entry, int *count)\n {\n+ MachineState *ms = MACHINE(qdev_get_machine());\n uint8_t features[SCCB_CPU_FEATURE_LEN] = { 0 };\n int i;\n \n s390_get_feat_block(S390_FEAT_TYPE_SCLP_CPU, features);\n- for (i = 0; i < count; i++) {\n- entry[i].address = i;\n- entry[i].type = 0;\n- memcpy(entry[i].features, features, sizeof(entry[i].features));\n+ for (i = 0, *count = 0; i < ms->possible_cpus->len; i++) {\n+ if (!ms->possible_cpus->cpus[i].cpu) {\n+ continue;\n+ }\n+ entry[*count].address = ms->possible_cpus->cpus[i].arch_id;\n+ entry[*count].type = 0;\n+ memcpy(entry[*count].features, features, sizeof(features));\n+ (*count)++;\n }\n }\n \n@@ -53,17 +58,13 @@ static void read_SCP_info(SCLPDevice *sclp, SCCB *sccb)\n ReadInfo *read_info = (ReadInfo *) sccb;\n MachineState *machine = MACHINE(qdev_get_machine());\n sclpMemoryHotplugDev *mhd = get_sclp_memory_hotplug_dev();\n- CPUState *cpu;\n- int cpu_count = 0;\n+ int cpu_count;\n int rnsize, rnmax;\n int slots = MIN(machine->ram_slots, s390_get_memslot_count());\n IplParameterBlock *ipib = s390_ipl_get_iplb();\n \n- CPU_FOREACH(cpu) {\n- cpu_count++;\n- }\n-\n /* CPU information */\n+ prepare_cpu_entries(sclp, read_info->entries, &cpu_count);\n read_info->entries_cpu = cpu_to_be16(cpu_count);\n read_info->offset_cpu = cpu_to_be16(offsetof(ReadInfo, entries));\n read_info->highest_cpu = cpu_to_be16(max_cpus);\n@@ -76,8 +77,6 @@ static void read_SCP_info(SCLPDevice *sclp, SCCB *sccb)\n s390_get_feat_block(S390_FEAT_TYPE_SCLP_CONF_CHAR_EXT,\n read_info->conf_char_ext);\n \n- prepare_cpu_entries(sclp, read_info->entries, cpu_count);\n-\n read_info->facilities = cpu_to_be64(SCLP_HAS_CPU_INFO |\n SCLP_HAS_IOA_RECONFIG);\n \n@@ -333,13 +332,9 @@ static void unassign_storage(SCLPDevice *sclp, SCCB *sccb)\n static void sclp_read_cpu_info(SCLPDevice *sclp, SCCB *sccb)\n {\n ReadCpuInfo *cpu_info = (ReadCpuInfo *) sccb;\n- CPUState *cpu;\n- int cpu_count = 0;\n-\n- CPU_FOREACH(cpu) {\n- cpu_count++;\n- }\n+ int cpu_count;\n \n+ prepare_cpu_entries(sclp, cpu_info->entries, &cpu_count);\n cpu_info->nr_configured = cpu_to_be16(cpu_count);\n cpu_info->offset_configured = cpu_to_be16(offsetof(ReadCpuInfo, entries));\n cpu_info->nr_standby = cpu_to_be16(0);\n@@ -348,7 +343,6 @@ static void sclp_read_cpu_info(SCLPDevice *sclp, SCCB *sccb)\n cpu_info->offset_standby = cpu_to_be16(cpu_info->offset_configured\n + cpu_info->nr_configured*sizeof(CPUEntry));\n \n- prepare_cpu_entries(sclp, cpu_info->entries, cpu_count);\n \n sccb->h.response_code = cpu_to_be16(SCLP_RC_NORMAL_READ_COMPLETION);\n }\n","prefixes":["v3","20/21"]}