[{"id":1767942,"web_url":"http://patchwork.ozlabs.org/comment/1767942/","msgid":"<20170913164506.33c704a0@nial.brq.redhat.com>","list_archive_url":null,"date":"2017-09-13T14:45:06","subject":"Re: [Qemu-devel] [PATCH v5 19/22] s390x: get rid of cpu_states and\n\tuse possible_cpus instead","submitter":{"id":11305,"url":"http://patchwork.ozlabs.org/api/people/11305/","name":"Igor Mammedov","email":"imammedo@redhat.com"},"content":"On Wed, 13 Sep 2017 15:24:14 +0200\nDavid Hildenbrand wrote:\n\n> Now that we have possible_cpus, we can get rid of the global variable\n> and rewrite s390_cpu_addr2state() to use it.\n> \n> Signed-off-by: David Hildenbrand \nReviewed-by: Igor Mammedov \n\n> ---\n> hw/s390x/s390-virtio-ccw.c | 36 ++++++++++--------------------------\n> 1 file changed, 10 insertions(+), 26 deletions(-)\n> \n> diff --git a/hw/s390x/s390-virtio-ccw.c b/hw/s390x/s390-virtio-ccw.c\n> index 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);","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-mx08.extmail.prod.ext.phx2.redhat.com;\n\tdmarc=none (p=none dis=none) header.from=redhat.com","ext-mx08.extmail.prod.ext.phx2.redhat.com;\n\tspf=fail smtp.mailfrom=imammedo@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 3xskxD4Klmz9sNr\n\tfor ;\n\tThu, 14 Sep 2017 00:45:52 +1000 (AEST)","from localhost ([::1]:42937 helo=lists.gnu.org)\n\tby lists.gnu.org with esmtp (Exim 4.71) (envelope-from\n\t)\n\tid 1ds8vG-0008NO-KJ\n\tfor incoming@patchwork.ozlabs.org; Wed, 13 Sep 2017 10:45:50 -0400","from eggs.gnu.org ([2001:4830:134:3::10]:45390)\n\tby lists.gnu.org with esmtp (Exim 4.71)\n\t(envelope-from ) id 1ds8uk-0008KI-U4\n\tfor qemu-devel@nongnu.org; Wed, 13 Sep 2017 10:45:23 -0400","from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71)\n\t(envelope-from ) id 1ds8ug-0004aT-Ve\n\tfor qemu-devel@nongnu.org; Wed, 13 Sep 2017 10:45:19 -0400","from mx1.redhat.com ([209.132.183.28]:56310)\n\tby eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32)\n\t(Exim 4.71) (envelope-from ) id 1ds8ug-0004Zf-Mq\n\tfor qemu-devel@nongnu.org; Wed, 13 Sep 2017 10:45:14 -0400","from smtp.corp.redhat.com\n\t(int-mx04.intmail.prod.int.phx2.redhat.com [10.5.11.14])\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 9A5A6C058EA8;\n\tWed, 13 Sep 2017 14:45:13 +0000 (UTC)","from nial.brq.redhat.com (unknown [10.43.2.209])\n\tby smtp.corp.redhat.com (Postfix) with ESMTP id E9C516C538;\n\tWed, 13 Sep 2017 14:45:07 +0000 (UTC)"],"DMARC-Filter":"OpenDMARC Filter v1.3.2 mx1.redhat.com 9A5A6C058EA8","Date":"Wed, 13 Sep 2017 16:45:06 +0200","From":"Igor Mammedov ","To":"David Hildenbrand ","Message-ID":"<20170913164506.33c704a0@nial.brq.redhat.com>","In-Reply-To":"<20170913132417.24384-20-david@redhat.com>","References":"<20170913132417.24384-1-david@redhat.com>\n\t<20170913132417.24384-20-david@redhat.com>","MIME-Version":"1.0","Content-Type":"text/plain; charset=US-ASCII","Content-Transfer-Encoding":"7bit","X-Scanned-By":"MIMEDefang 2.79 on 10.5.11.14","X-Greylist":"Sender IP whitelisted, not delayed by milter-greylist-4.5.16\n\t(mx1.redhat.com [10.5.110.32]);\n\tWed, 13 Sep 2017 14:45:13 +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":"Re: [Qemu-devel] [PATCH v5 19/22] s390x: get rid of cpu_states and\n\tuse possible_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 ,\n\tMarkus Armbruster , cohuck@redhat.com,\n\tRichard Henderson ,\n\tqemu-devel@nongnu.org, Alexander Graf ,\n\tborntraeger@de.ibm.com, Paolo Bonzini ","Errors-To":"qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org","Sender":"\"Qemu-devel\"\n\t"}}]