From nobody Tue Feb 10 05:45:54 2026 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org ARC-Seal: i=1; a=rsa-sha256; t=1597314985; cv=none; d=zohomail.com; s=zohoarc; b=SxSBZ/nWlGM0C2uLVK0R3UiEEyX2unb1kiT9ljcsyRTgolYABZNQLJtheCgWBkPpzQLTXg6IMVi4orlFCISlqKn9AaYlgJ3fEq6Ty7ejR6Q5r14B2CAPNf7DTGIiLmmTleM1p0T5806arvXmiPvursfpW8B4JGbVsALSYnBW8Tc= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1597314985; h=Content-Type:Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To; bh=0PBGyv0y8ZeQYeDoV3BZbzIyeVo+wf+ixIgW4yQ+IH0=; b=OzoaBzU03n3gy6Rk5sMBPBjrjP5YJFwMhvd537xr2XEYKnWuxyLoHpdbuMohNut7l/A5hj9y/7llfoJxG8f6hzttOTiqlrMsgn5Elt6xdLFwPFnfDbEDcaEFrjjT7VUsbd+1RBMHfhq808gQ5MVaGTR+TuW+U/kC+d/oMSipnWU= ARC-Authentication-Results: i=1; mx.zohomail.com; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1597314985924443.60348189320223; Thu, 13 Aug 2020 03:36:25 -0700 (PDT) Received: from localhost ([::1]:44782 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1k6Aau-00066P-J5 for importer@patchew.org; Thu, 13 Aug 2020 06:36:24 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:49976) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1k6AXC-00004y-KZ; Thu, 13 Aug 2020 06:32:34 -0400 Received: from szxga04-in.huawei.com ([45.249.212.190]:4182 helo=huawei.com) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1k6AX8-0006p1-PZ; Thu, 13 Aug 2020 06:32:34 -0400 Received: from DGGEMS414-HUB.china.huawei.com (unknown [172.30.72.59]) by Forcepoint Email with ESMTP id 1F1F7F1691C568442C8D; Thu, 13 Aug 2020 18:32:27 +0800 (CST) Received: from localhost.localdomain (10.175.104.175) by DGGEMS414-HUB.china.huawei.com (10.3.19.214) with Microsoft SMTP Server id 14.3.487.0; Thu, 13 Aug 2020 18:32:16 +0800 From: Peng Liang To: , Subject: [RFC 2/9] target/arm: parse cpu feature related options Date: Thu, 13 Aug 2020 18:26:50 +0800 Message-ID: <20200813102657.2588720-3-liangpeng10@huawei.com> X-Mailer: git-send-email 2.18.4 In-Reply-To: <20200813102657.2588720-1-liangpeng10@huawei.com> References: <20200813102657.2588720-1-liangpeng10@huawei.com> MIME-Version: 1.0 X-Originating-IP: [10.175.104.175] X-CFilter-Loop: Reflected Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Received-SPF: pass client-ip=45.249.212.190; envelope-from=liangpeng10@huawei.com; helo=huawei.com X-detected-operating-system: by eggs.gnu.org: First seen = 2020/08/13 06:32:27 X-ACL-Warn: Detected OS = Linux 3.11 and newer [fuzzy] X-Spam_score_int: -41 X-Spam_score: -4.2 X-Spam_bar: ---- X-Spam_report: (-4.2 / 5.0 requ) BAYES_00=-1.9, RCVD_IN_DNSWL_MED=-2.3, RCVD_IN_MSPIKE_H4=-0.01, RCVD_IN_MSPIKE_WL=-0.01, SPF_HELO_PASS=-0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: peter.maydell@linaro.org, drjones@redhat.com, zhang.zhanghailiang@huawei.com, mst@redhat.com, cohuck@redhat.com, xiexiangyou@huawei.com, Peng Liang , pbonzini@redhat.com Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" The implementation of CPUClass::parse_features only supports CPU features in "feature=3Dvalue" format. However, libvirt maybe send us a CPU feature string in "+feature/-feature" format. Hence, we need to override CPUClass::parse_features to support CPU feature string in both "feature=3Dvalue" and "+feature/-feature" format. The logic of AArch64CPUClass::parse_features is similar to that of X86CPUClass::parse_features. The diference is that feature name is transformed to upper before it's added as a property because the name of CPU features is upper for convenience. Signed-off-by: zhanghailiang Signed-off-by: Peng Liang --- target/arm/cpu64.c | 101 +++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 101 insertions(+) diff --git a/target/arm/cpu64.c b/target/arm/cpu64.c index 4b52505b6e..981011b3da 100644 --- a/target/arm/cpu64.c +++ b/target/arm/cpu64.c @@ -28,6 +28,7 @@ #include "sysemu/kvm.h" #include "kvm_arm.h" #include "qapi/visitor.h" +#include "hw/qdev-properties.h" =20 #ifndef CONFIG_USER_ONLY static uint64_t a57_a53_l2ctlr_read(CPUARMState *env, const ARMCPRegInfo *= ri) @@ -778,6 +779,105 @@ static gchar *aarch64_gdb_arch_name(CPUState *cs) return g_strdup("aarch64"); } =20 +static void +cpu_add_feat_as_prop(const char *typename, const char *name, const char *v= al) +{ + GlobalProperty *prop =3D g_new0(typeof(*prop), 1); + prop->driver =3D typename; + prop->property =3D g_strdup(name); + prop->value =3D g_strdup(val); + qdev_prop_register_global(prop); +} + +static gint compare_string(gconstpointer a, gconstpointer b) +{ + return g_strcmp0(a, b); +} + +static GList *plus_features, *minus_features; + +static char *strtoupr(char *str) +{ + char *orign =3D str; + + for (; *str !=3D '\0'; str++) { + *str =3D toupper(*str); + } + + return orign; +} + +static void aarch64_cpu_parse_features(const char *typename, char *feature= s, + Error **errp) +{ + GList *l; + char *featurestr; /* Single 'key=3Dvalue" string being parsed */ + static bool cpu_globals_initialized; + + if (cpu_globals_initialized) { + return; + } + cpu_globals_initialized =3D true; + + if (!features) { + return; + } + for (featurestr =3D strtok(features, ","); + featurestr; + featurestr =3D strtok(NULL, ",")) { + const char *name; + char *tmp; + const char *val =3D NULL; + char *eq =3D NULL; + + /* Compatibility syntax: */ + if (featurestr[0] =3D=3D '+') { + plus_features =3D g_list_append(plus_features, + g_strdup(featurestr + 1)); + continue; + } else if (featurestr[0] =3D=3D '-') { + minus_features =3D g_list_append(minus_features, + g_strdup(featurestr + 1)); + continue; + } + + eq =3D strchr(featurestr, '=3D'); + name =3D featurestr; + if (eq) { + *eq++ =3D 0; + val =3D eq; + } else { + error_setg(errp, "Unsupported property format: %s", name); + return; + } + + if (g_list_find_custom(plus_features, name, compare_string)) { + warn_report("Ambiguous CPU model string. " + "Don't mix both \"+%s\" and \"%s=3D%s\"", + name, name, val); + } + if (g_list_find_custom(minus_features, name, compare_string)) { + warn_report("Ambiguous CPU model string. " + "Don't mix both \"-%s\" and \"%s=3D%s\"", + name, name, val); + } + tmp =3D g_strdup(name); + tmp =3D strtoupr(tmp); + cpu_add_feat_as_prop(typename, tmp, val); + g_free(tmp); + } + + for (l =3D plus_features; l; l =3D l->next) { + const char *name =3D strtoupr(l->data); /* convert to upper string= */ + cpu_add_feat_as_prop(typename, name, "on"); + } + + for (l =3D minus_features; l; l =3D l->next) { + const char *name =3D strtoupr(l->data); + cpu_add_feat_as_prop(typename, name, "off"); + } +} + static void aarch64_cpu_class_init(ObjectClass *oc, void *data) { CPUClass *cc =3D CPU_CLASS(oc); @@ -788,6 +888,7 @@ static void aarch64_cpu_class_init(ObjectClass *oc, voi= d *data) cc->gdb_num_core_regs =3D 34; cc->gdb_core_xml_file =3D "aarch64-core.xml"; cc->gdb_arch_name =3D aarch64_gdb_arch_name; + cc->parse_features =3D aarch64_cpu_parse_features; } =20 static void aarch64_cpu_instance_init(Object *obj) --=20 2.18.4