[{"id":1767076,"web_url":"http://patchwork.ozlabs.org/comment/1767076/","msgid":"<20170912155044.7c0b5805@nial.brq.redhat.com>","list_archive_url":null,"date":"2017-09-12T13:50:44","subject":"Re: [Qemu-devel] [PATCH v4 19/21] s390x: get rid of\n\tcpu_s390x_create()","submitter":{"id":11305,"url":"http://patchwork.ozlabs.org/api/people/11305/","name":"Igor Mammedov","email":"imammedo@redhat.com"},"content":"On Mon, 11 Sep 2017 17:21:48 +0200\nDavid Hildenbrand wrote:\n\n> Now that there is only one user of cpu_s390x_create() left, make cpu\n> creation look like on x86.\n> - Perform the model/properties split and checks in s390_init_cpus()\n> - Parse features only once without having to remember if already parsed\n> - Pass only the typename to s390x_new_cpu()\n> - Use the typename of an existing CPU for hotplug via cpu-add\n> \n> Signed-off-by: David Hildenbrand \nAcked-by: Igor Mammedov \n\n> ---\n> hw/s390x/s390-virtio-ccw.c | 29 +++++++++++++++++++++++++++--\n> target/s390x/cpu.h | 2 +-\n> target/s390x/helper.c | 45 ++-------------------------------------------\n> target/s390x/internal.h | 1 -\n> 4 files changed, 30 insertions(+), 47 deletions(-)\n> \n> diff --git a/hw/s390x/s390-virtio-ccw.c b/hw/s390x/s390-virtio-ccw.c\n> index 0e10a4c73a..10f6933fbd 100644\n> --- a/hw/s390x/s390-virtio-ccw.c\n> +++ b/hw/s390x/s390-virtio-ccw.c\n> @@ -41,6 +41,10 @@\n> static void s390_init_cpus(MachineState *machine)\n> {\n> MachineClass *mc = MACHINE_GET_CLASS(machine);\n> + const char *typename;\n> + gchar **model_pieces;\n> + ObjectClass *oc;\n> + CPUClass *cc;\n> int i;\n> \n> if (machine->cpu_model == NULL) {\n> @@ -57,8 +61,25 @@ static void s390_init_cpus(MachineState *machine)\n> /* initialize possible_cpus */\n> mc->possible_cpu_arch_ids(machine);\n> \n> + model_pieces = g_strsplit(machine->cpu_model, \",\", 2);\n> + if (!model_pieces[0]) {\n> + error_report(\"Invalid/empty CPU model name\");\n> + exit(1);\n> + }\n> +\n> + oc = cpu_class_by_name(TYPE_S390_CPU, model_pieces[0]);\n> + if (!oc) {\n> + error_report(\"Unable to find CPU definition: %s\", model_pieces[0]);\n> + exit(1);\n> + }\n> + typename = object_class_get_name(oc);\n> + cc = CPU_CLASS(oc);\n> + /* after parsing, properties will be applied to all *typename* instances */\n> + cc->parse_features(typename, model_pieces[1], &error_fatal);\n> + g_strfreev(model_pieces);\n> +\n> for (i = 0; i < smp_cpus; i++) {\n> - s390x_new_cpu(machine->cpu_model, i, &error_fatal);\n> + s390x_new_cpu(typename, i, &error_fatal);\n> }\n> }\n> \n> @@ -382,8 +403,12 @@ static HotplugHandler *s390_get_hotplug_handler(MachineState *machine,\n> static void s390_hot_add_cpu(const int64_t id, Error **errp)\n> {\n> MachineState *machine = MACHINE(qdev_get_machine());\n> + ObjectClass *oc;\n> +\n> + g_assert(machine->possible_cpus->cpus[0].cpu);\n> + oc = OBJECT_CLASS(CPU_GET_CLASS(machine->possible_cpus->cpus[0].cpu));\n> \n> - s390x_new_cpu(machine->cpu_model, id, errp);\n> + s390x_new_cpu(object_class_get_name(oc), id, errp);\n> }\n> \n> static void s390_nmi(NMIState *n, int cpu_index, Error **errp)\n> diff --git a/target/s390x/cpu.h b/target/s390x/cpu.h\n> index 5810079f48..56eccb0104 100644\n> --- a/target/s390x/cpu.h\n> +++ b/target/s390x/cpu.h\n> @@ -690,7 +690,7 @@ const char *s390_default_cpu_model_name(void);\n> \n> /* helper.c */\n> #define cpu_init(cpu_model) cpu_generic_init(TYPE_S390_CPU, cpu_model)\n> -S390CPU *s390x_new_cpu(const char *cpu_model, uint32_t core_id, Error **errp);\n> +S390CPU *s390x_new_cpu(const char *typename, uint32_t core_id, Error **errp);\n> /* you can call this signal handler from your SIGBUS and SIGSEGV\n> signal handlers to inform the virtual CPU of exceptions. non zero\n> is returned if the signal was handled by the virtual CPU. */\n> diff --git a/target/s390x/helper.c b/target/s390x/helper.c\n> index dfb24ef5b2..97adbcc86d 100644\n> --- a/target/s390x/helper.c\n> +++ b/target/s390x/helper.c\n> @@ -68,52 +68,11 @@ void s390x_cpu_timer(void *opaque)\n> }\n> #endif\n> \n> -S390CPU *cpu_s390x_create(const char *cpu_model, Error **errp)\n> +S390CPU *s390x_new_cpu(const char *typename, uint32_t core_id, Error **errp)\n> {\n> - static bool features_parsed;\n> - char *name, *features;\n> - const char *typename;\n> - ObjectClass *oc;\n> - CPUClass *cc;\n> -\n> - name = g_strdup(cpu_model);\n> - features = strchr(name, ',');\n> - if (features) {\n> - features[0] = 0;\n> - features++;\n> - }\n> -\n> - oc = cpu_class_by_name(TYPE_S390_CPU, name);\n> - if (!oc) {\n> - error_setg(errp, \"Unknown CPU definition \\'%s\\'\", name);\n> - g_free(name);\n> - return NULL;\n> - }\n> - typename = object_class_get_name(oc);\n> -\n> - if (!features_parsed) {\n> - features_parsed = true;\n> - cc = CPU_CLASS(oc);\n> - cc->parse_features(typename, features, errp);\n> - }\n> - g_free(name);\n> -\n> - if (*errp) {\n> - return NULL;\n> - }\n> - return S390_CPU(CPU(object_new(typename)));\n> -}\n> -\n> -S390CPU *s390x_new_cpu(const char *cpu_model, uint32_t core_id, Error **errp)\n> -{\n> - S390CPU *cpu;\n> + S390CPU *cpu = S390_CPU(object_new(typename));\n> Error *err = NULL;\n> \n> - cpu = cpu_s390x_create(cpu_model, &err);\n> - if (err != NULL) {\n> - goto out;\n> - }\n> -\n> object_property_set_int(OBJECT(cpu), core_id, \"core-id\", &err);\n> if (err != NULL) {\n> goto out;\n> diff --git a/target/s390x/internal.h b/target/s390x/internal.h\n> index b4d3583b24..bc8f83129a 100644\n> --- a/target/s390x/internal.h\n> +++ b/target/s390x/internal.h\n> @@ -337,7 +337,6 @@ uint64_t get_psw_mask(CPUS390XState *env);\n> void s390_cpu_recompute_watchpoints(CPUState *cs);\n> void s390x_tod_timer(void *opaque);\n> void s390x_cpu_timer(void *opaque);\n> -S390CPU *cpu_s390x_create(const char *cpu_model, Error **errp);\n> void do_restart_interrupt(CPUS390XState *env);\n> #ifndef CONFIG_USER_ONLY\n> LowCore *cpu_map_lowcore(CPUS390XState *env);","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-mx05.extmail.prod.ext.phx2.redhat.com;\n\tdmarc=none (p=none dis=none) header.from=redhat.com","ext-mx05.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 3xs5n820qxz9s7B\n\tfor ;\n\tTue, 12 Sep 2017 23:51:40 +1000 (AEST)","from localhost ([::1]:36004 helo=lists.gnu.org)\n\tby lists.gnu.org with esmtp (Exim 4.71) (envelope-from\n\t)\n\tid 1drlbG-0007m2-EJ\n\tfor incoming@patchwork.ozlabs.org; Tue, 12 Sep 2017 09:51:38 -0400","from eggs.gnu.org ([2001:4830:134:3::10]:51055)\n\tby lists.gnu.org with esmtp (Exim 4.71)\n\t(envelope-from ) id 1drlaZ-0007h0-SL\n\tfor qemu-devel@nongnu.org; Tue, 12 Sep 2017 09:51:02 -0400","from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71)\n\t(envelope-from ) id 1drlaW-0004DP-Vp\n\tfor qemu-devel@nongnu.org; Tue, 12 Sep 2017 09:50:55 -0400","from mx1.redhat.com ([209.132.183.28]:58262)\n\tby eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32)\n\t(Exim 4.71) (envelope-from ) id 1drlaV-0004Bb-QM\n\tfor qemu-devel@nongnu.org; Tue, 12 Sep 2017 09:50:52 -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 A110BA78C;\n\tTue, 12 Sep 2017 13:50:50 +0000 (UTC)","from nial.brq.redhat.com (unknown [10.43.2.209])\n\tby smtp.corp.redhat.com (Postfix) with ESMTP id 53B0F6DA89;\n\tTue, 12 Sep 2017 13:50:45 +0000 (UTC)"],"DMARC-Filter":"OpenDMARC Filter v1.3.2 mx1.redhat.com A110BA78C","Date":"Tue, 12 Sep 2017 15:50:44 +0200","From":"Igor Mammedov ","To":"David Hildenbrand ","Message-ID":"<20170912155044.7c0b5805@nial.brq.redhat.com>","In-Reply-To":"<20170911152150.12535-20-david@redhat.com>","References":"<20170911152150.12535-1-david@redhat.com>\n\t<20170911152150.12535-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.29]);\n\tTue, 12 Sep 2017 13:50:50 +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 v4 19/21] s390x: get rid of\n\tcpu_s390x_create()","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"}}]