{"id":809691,"url":"http://patchwork.ozlabs.org/api/1.0/patches/809691/?format=json","project":{"id":14,"url":"http://patchwork.ozlabs.org/api/1.0/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":""},"msgid":"<1504533662-198084-2-git-send-email-imammedo@redhat.com>","date":"2017-09-04T14:00:57","name":"[1/6] qom: cpus: split cpu_generic_init() on feature parsing and cpu creation parts","commit_ref":null,"pull_url":null,"state":"new","archived":false,"hash":"39df73c48411095dc858d17869db4ccd4889e3b7","submitter":{"id":11305,"url":"http://patchwork.ozlabs.org/api/1.0/people/11305/?format=json","name":"Igor Mammedov","email":"imammedo@redhat.com"},"delegate":null,"mbox":"http://patchwork.ozlabs.org/project/qemu-devel/patch/1504533662-198084-2-git-send-email-imammedo@redhat.com/mbox/","series":[{"id":1390,"url":"http://patchwork.ozlabs.org/api/1.0/series/1390/?format=json","date":"2017-09-04T14:00:57","name":"generalize parsing of cpu_model (x86/arm)","version":1,"mbox":"http://patchwork.ozlabs.org/series/1390/mbox/"}],"check":"pending","checks":"http://patchwork.ozlabs.org/api/patches/809691/checks/","tags":{},"headers":{"Return-Path":"<qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org>","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=<UNKNOWN>)","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=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 3xmBP44RZmz9s75\n\tfor <incoming@patchwork.ozlabs.org>;\n\tTue,  5 Sep 2017 00:02:14 +1000 (AEST)","from localhost ([::1]:44649 helo=lists.gnu.org)\n\tby lists.gnu.org with esmtp (Exim 4.71) (envelope-from\n\t<qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org>)\n\tid 1dorx6-0003g5-9X\n\tfor incoming@patchwork.ozlabs.org; Mon, 04 Sep 2017 10:02:12 -0400","from eggs.gnu.org ([2001:4830:134:3::10]:47936)\n\tby lists.gnu.org with esmtp (Exim 4.71)\n\t(envelope-from <imammedo@redhat.com>) id 1dorwC-0003fH-MF\n\tfor qemu-devel@nongnu.org; Mon, 04 Sep 2017 10:01:22 -0400","from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71)\n\t(envelope-from <imammedo@redhat.com>) id 1dorw2-0003nE-Sc\n\tfor qemu-devel@nongnu.org; Mon, 04 Sep 2017 10:01:16 -0400","from mx1.redhat.com ([209.132.183.28]:32844)\n\tby eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32)\n\t(Exim 4.71) (envelope-from <imammedo@redhat.com>) id 1dorw2-0003mY-KL\n\tfor qemu-devel@nongnu.org; Mon, 04 Sep 2017 10:01:06 -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 91F74A963F;\n\tMon,  4 Sep 2017 14:01:05 +0000 (UTC)","from dell-r430-03.lab.eng.brq.redhat.com\n\t(dell-r430-03.lab.eng.brq.redhat.com [10.34.112.60])\n\tby smtp.corp.redhat.com (Postfix) with ESMTP id 9177066829;\n\tMon,  4 Sep 2017 14:01:04 +0000 (UTC)"],"DMARC-Filter":"OpenDMARC Filter v1.3.2 mx1.redhat.com 91F74A963F","From":"Igor Mammedov <imammedo@redhat.com>","To":"qemu-devel@nongnu.org","Date":"Mon,  4 Sep 2017 16:00:57 +0200","Message-Id":"<1504533662-198084-2-git-send-email-imammedo@redhat.com>","In-Reply-To":"<1504533662-198084-1-git-send-email-imammedo@redhat.com>","References":"<1504533662-198084-1-git-send-email-imammedo@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.38]);\n\tMon, 04 Sep 2017 14:01:05 +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 1/6] qom: cpus: split cpu_generic_init() on\n\tfeature parsing and cpu creation parts","X-BeenThere":"qemu-devel@nongnu.org","X-Mailman-Version":"2.1.21","Precedence":"list","List-Id":"<qemu-devel.nongnu.org>","List-Unsubscribe":"<https://lists.nongnu.org/mailman/options/qemu-devel>,\n\t<mailto:qemu-devel-request@nongnu.org?subject=unsubscribe>","List-Archive":"<http://lists.nongnu.org/archive/html/qemu-devel/>","List-Post":"<mailto:qemu-devel@nongnu.org>","List-Help":"<mailto:qemu-devel-request@nongnu.org?subject=help>","List-Subscribe":"<https://lists.nongnu.org/mailman/listinfo/qemu-devel>,\n\t<mailto:qemu-devel-request@nongnu.org?subject=subscribe>","Cc":"Andrew Jones <drjones@redhat.com>, Eduardo Habkost <ehabkost@redhat.com>,\n\tRichard Henderson <rth@twiddle.net>","Errors-To":"qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org","Sender":"\"Qemu-devel\"\n\t<qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org>"},"content":"it would allow to reuse feature parsing part in various machines\nthat have CPU features instead of re-implementing the same feature\nparsing each time.\n\nSigned-off-by: Igor Mammedov <imammedo@redhat.com>\n---\n include/qom/cpu.h | 21 +++++++++++++++++++++\n qom/cpu.c         | 46 ++++++++++++++++++++++++++++++----------------\n 2 files changed, 51 insertions(+), 16 deletions(-)","diff":"diff --git a/include/qom/cpu.h b/include/qom/cpu.h\nindex b7ac949..a92a7d2 100644\n--- a/include/qom/cpu.h\n+++ b/include/qom/cpu.h\n@@ -633,6 +633,27 @@ void cpu_reset(CPUState *cpu);\n ObjectClass *cpu_class_by_name(const char *typename, const char *cpu_model);\n \n /**\n+ * cpu_create:\n+ * @typename: The CPU type.\n+ *\n+ * Instantiates a CPU and realizes the CPU.\n+ *\n+ * Returns: A #CPUState or %NULL if an error occurred.\n+ */\n+CPUState *cpu_create(const char *typename);\n+\n+/**\n+ * cpu_parse_features:\n+ * @typename: The CPU base type or CPU type.\n+ * @cpu_model: The model string including optional parameters.\n+ *\n+ * processes optional parameters and registers them as global properties\n+ *\n+ * Returns: type of CPU to create or %NULL if an error occurred.\n+ */\n+const char *cpu_parse_features(const char *typename, const char *cpu_model);\n+\n+/**\n  * cpu_generic_init:\n  * @typename: The CPU base type.\n  * @cpu_model: The model string including optional parameters.\ndiff --git a/qom/cpu.c b/qom/cpu.c\nindex deb8880..d715890 100644\n--- a/qom/cpu.c\n+++ b/qom/cpu.c\n@@ -53,13 +53,26 @@ bool cpu_exists(int64_t id)\n     return !!cpu_by_arch_id(id);\n }\n \n-CPUState *cpu_generic_init(const char *typename, const char *cpu_model)\n+CPUState *cpu_create(const char *typename)\n+{\n+    Error *err = NULL;\n+    CPUState *cpu = CPU(object_new(typename));\n+    object_property_set_bool(OBJECT(cpu), true, \"realized\", &err);\n+    if (err != NULL) {\n+        error_report_err(err);\n+        object_unref(OBJECT(cpu));\n+        return NULL;\n+    }\n+    return cpu;\n+}\n+\n+const char *cpu_parse_features(const char *typename, const char *cpu_model)\n {\n-    CPUState *cpu = NULL;\n     ObjectClass *oc;\n     CPUClass *cc;\n     Error *err = NULL;\n     gchar **model_pieces;\n+    const char *cpu_type;\n \n     model_pieces = g_strsplit(cpu_model, \",\", 2);\n \n@@ -69,27 +82,28 @@ CPUState *cpu_generic_init(const char *typename, const char *cpu_model)\n         return NULL;\n     }\n \n+    cpu_type = object_class_get_name(oc);\n     cc = CPU_CLASS(oc);\n-    /* TODO: all callers of cpu_generic_init() need to be converted to\n-     * call parse_features() only once, before calling cpu_generic_init().\n-     */\n-    cc->parse_features(object_class_get_name(oc), model_pieces[1], &err);\n+    cc->parse_features(cpu_type, model_pieces[1], &err);\n     g_strfreev(model_pieces);\n     if (err != NULL) {\n-        goto out;\n-    }\n-\n-    cpu = CPU(object_new(object_class_get_name(oc)));\n-    object_property_set_bool(OBJECT(cpu), true, \"realized\", &err);\n-\n-out:\n-    if (err != NULL) {\n         error_report_err(err);\n-        object_unref(OBJECT(cpu));\n         return NULL;\n     }\n+    return cpu_type;\n+}\n \n-    return cpu;\n+CPUState *cpu_generic_init(const char *typename, const char *cpu_model)\n+{\n+    /* TODO: all callers of cpu_generic_init() need to be converted to\n+     * call cpu_parse_features() only once, before calling cpu_generic_init().\n+     */\n+    const char *cpu_type = cpu_parse_features(typename, cpu_model);\n+\n+    if (cpu_type) {\n+        return cpu_create(cpu_type);\n+    }\n+    return NULL;\n }\n \n bool cpu_paging_enabled(const CPUState *cpu)\n","prefixes":["1/6"]}