{"id":813436,"url":"http://patchwork.ozlabs.org/api/patches/813436/?format=json","web_url":"http://patchwork.ozlabs.org/project/qemu-devel/patch/20170913132417.24384-20-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":"<20170913132417.24384-20-david@redhat.com>","list_archive_url":null,"date":"2017-09-13T13:24:14","name":"[v5,19/22] s390x: get rid of cpu_states and use possible_cpus instead","commit_ref":null,"pull_url":null,"state":"new","archived":false,"hash":"2ae9cf54e8c80c4ffbc448b9c76c568db2395145","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/20170913132417.24384-20-david@redhat.com/mbox/","series":[{"id":2916,"url":"http://patchwork.ozlabs.org/api/series/2916/?format=json","web_url":"http://patchwork.ozlabs.org/project/qemu-devel/list/?series=2916","date":"2017-09-13T13:23:55","name":"s390x cleanups and CPU hotplug via device_add","version":5,"mbox":"http://patchwork.ozlabs.org/series/2916/mbox/"}],"comments":"http://patchwork.ozlabs.org/api/patches/813436/comments/","check":"pending","checks":"http://patchwork.ozlabs.org/api/patches/813436/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-mx09.extmail.prod.ext.phx2.redhat.com;\n\tdmarc=none (p=none dis=none) header.from=redhat.com","ext-mx09.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 3xsjDs5NDxz9sNr\n\tfor ;\n\tWed, 13 Sep 2017 23:29:17 +1000 (AEST)","from localhost ([::1]:42533 helo=lists.gnu.org)\n\tby lists.gnu.org with esmtp (Exim 4.71) (envelope-from\n\t)\n\tid 1ds7j9-0000Vq-Qs\n\tfor incoming@patchwork.ozlabs.org; Wed, 13 Sep 2017 09:29:15 -0400","from eggs.gnu.org ([2001:4830:134:3::10]:39560)\n\tby lists.gnu.org with esmtp (Exim 4.71)\n\t(envelope-from ) id 1ds7fz-00069A-A6\n\tfor qemu-devel@nongnu.org; Wed, 13 Sep 2017 09:26:00 -0400","from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71)\n\t(envelope-from ) id 1ds7fv-0003T0-7w\n\tfor qemu-devel@nongnu.org; Wed, 13 Sep 2017 09:25:59 -0400","from mx1.redhat.com ([209.132.183.28]:44770)\n\tby eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32)\n\t(Exim 4.71) (envelope-from ) id 1ds7fu-0003SK-Vy\n\tfor qemu-devel@nongnu.org; Wed, 13 Sep 2017 09:25:55 -0400","from smtp.corp.redhat.com\n\t(int-mx01.intmail.prod.int.phx2.redhat.com [10.5.11.11])\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 03A0C4E4D4;\n\tWed, 13 Sep 2017 13:25:54 +0000 (UTC)","from t460s.redhat.com (ovpn-116-21.ams2.redhat.com [10.36.116.21])\n\tby smtp.corp.redhat.com (Postfix) with ESMTP id 74C0469FB6;\n\tWed, 13 Sep 2017 13:25:50 +0000 (UTC)"],"DMARC-Filter":"OpenDMARC Filter v1.3.2 mx1.redhat.com 03A0C4E4D4","From":"David Hildenbrand ","To":"qemu-devel@nongnu.org","Date":"Wed, 13 Sep 2017 15:24:14 +0200","Message-Id":"<20170913132417.24384-20-david@redhat.com>","In-Reply-To":"<20170913132417.24384-1-david@redhat.com>","References":"<20170913132417.24384-1-david@redhat.com>","X-Scanned-By":"MIMEDefang 2.79 on 10.5.11.11","X-Greylist":"Sender IP whitelisted, not delayed by milter-greylist-4.5.16\n\t(mx1.redhat.com [10.5.110.38]);\n\tWed, 13 Sep 2017 13:25: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 v5 19/22] s390x: get rid of cpu_states and use\n\tpossible_cpus instead","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 ,\n\tMarkus Armbruster , borntraeger@de.ibm.com,\n\tIgor Mammedov , Paolo Bonzini ","Errors-To":"qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org","Sender":"\"Qemu-devel\"\n\t"},"content":"Now that we have possible_cpus, we can get rid of the global variable\nand rewrite s390_cpu_addr2state() to use it.\n\nSigned-off-by: David Hildenbrand \n---\n hw/s390x/s390-virtio-ccw.c | 36 ++++++++++--------------------------\n 1 file changed, 10 insertions(+), 26 deletions(-)","diff":"diff --git a/hw/s390x/s390-virtio-ccw.c b/hw/s390x/s390-virtio-ccw.c\nindex cc64a81321..720f145054 100644\n--- a/hw/s390x/s390-virtio-ccw.c\n+++ b/hw/s390x/s390-virtio-ccw.c\n@@ -36,23 +36,26 @@\n #include \"qapi/qmp/qerror.h\"\n #include \"hw/nmi.h\"\n \n-static S390CPU **cpu_states;\n-\n S390CPU *s390_cpu_addr2state(uint16_t cpu_addr)\n {\n- if (cpu_addr >= max_cpus) {\n- return NULL;\n+ static MachineState *ms;\n+\n+ if (!ms) {\n+ ms = MACHINE(qdev_get_machine());\n+ g_assert(ms->possible_cpus);\n }\n \n- /* Fast lookup via CPU ID */\n- return cpu_states[cpu_addr];\n+ /* CPU address corresponds to the core_id and the index */\n+ if (cpu_addr >= ms->possible_cpus->len) {\n+ return NULL;\n+ }\n+ return S390_CPU(ms->possible_cpus->cpus[cpu_addr].cpu);\n }\n \n static void s390_init_cpus(MachineState *machine)\n {\n MachineClass *mc = MACHINE_GET_CLASS(machine);\n int i;\n- gchar *name;\n \n if (machine->cpu_model == NULL) {\n machine->cpu_model = s390_default_cpu_model_name();\n@@ -63,18 +66,6 @@ static void s390_init_cpus(MachineState *machine)\n exit(1);\n }\n \n- cpu_states = g_new0(S390CPU *, max_cpus);\n-\n- for (i = 0; i < max_cpus; i++) {\n- name = g_strdup_printf(\"cpu[%i]\", i);\n- object_property_add_link(OBJECT(machine), name, TYPE_S390_CPU,\n- (Object **) &cpu_states[i],\n- object_property_allow_set_link,\n- OBJ_PROP_LINK_UNREF_ON_RELEASE,\n- &error_abort);\n- g_free(name);\n- }\n-\n /* initialize possible_cpus */\n mc->possible_cpu_arch_ids(machine);\n \n@@ -310,15 +301,8 @@ static void ccw_init(MachineState *machine)\n static void s390_cpu_plug(HotplugHandler *hotplug_dev,\n DeviceState *dev, Error **errp)\n {\n- gchar *name;\n MachineState *ms = MACHINE(hotplug_dev);\n S390CPU *cpu = S390_CPU(dev);\n- CPUState *cs = CPU(dev);\n-\n- name = g_strdup_printf(\"cpu[%i]\", cpu->env.core_id);\n- object_property_set_link(OBJECT(hotplug_dev), OBJECT(cs), name,\n- errp);\n- g_free(name);\n \n g_assert(!ms->possible_cpus->cpus[cpu->env.core_id].cpu);\n ms->possible_cpus->cpus[cpu->env.core_id].cpu = OBJECT(dev);\n","prefixes":["v5","19/22"]}