From nobody Tue Feb 10 00:59:29 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=1597314999; cv=none; d=zohomail.com; s=zohoarc; b=G1iCtsl4Pg7xnFypp1icdTUKDtPjGsT1yBbYrmv++VK9AR5MEiHueTX/l7Kb2GOynvK7zLAGajxDqkW2Ujq+Ap1cj/t2OPS9qviTWdC9mHokwD/lzpJ591dwcR3yCN2UPyEEt5A82g+2S270fIiDGJ3c2YW262gKU/OhglaCYog= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1597314999; 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=zxKlsokqpfzaRulvwa3BdSbljI5i71RwG/NfY/fg3Qk=; b=FyICSqNlK4+Urlju/eXCBSAnisfGvvcXcSvwvddoQU1x7qOyyPy/mQHsHOa5O/fuNsV+ekX8Nf9eZSXspWmDlPzJ3CATYYec0ElW8BJCokQvmEBSDoaItbYH9EHhiZWLDx5+UxE8JeeIwJH+0EKB5bl495crmIkemod2CYKdVAw= 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 159731499938717.926377207637643; Thu, 13 Aug 2020 03:36:39 -0700 (PDT) Received: from localhost ([::1]:45458 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1k6Ab7-0006Mu-Vp for importer@patchew.org; Thu, 13 Aug 2020 06:36:38 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:50048) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1k6AXH-0000Ee-29; Thu, 13 Aug 2020 06:32:39 -0400 Received: from szxga04-in.huawei.com ([45.249.212.190]:4186 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 1k6AXE-0006qF-PT; Thu, 13 Aug 2020 06:32:38 -0400 Received: from DGGEMS414-HUB.china.huawei.com (unknown [172.30.72.59]) by Forcepoint Email with ESMTP id 2C3A3952A789AAB8465B; Thu, 13 Aug 2020 18:32:32 +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:22 +0800 From: Peng Liang To: , Subject: [RFC 7/9] target/arm: Add CPU features to query-cpu-model-expansion Date: Thu, 13 Aug 2020 18:26:55 +0800 Message-ID: <20200813102657.2588720-8-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" Add CPU features to the result of query-cpu-model-expansion so that other applications (such as libvirt) can know the supported CPU features. Signed-off-by: zhanghailiang Signed-off-by: Peng Liang --- target/arm/cpu.c | 41 +++++++++++++++++++++++++++++++++++++++++ target/arm/cpu.h | 2 ++ target/arm/monitor.c | 2 ++ 3 files changed, 45 insertions(+) diff --git a/target/arm/cpu.c b/target/arm/cpu.c index 3fc54cb3a4..0f620e8afe 100644 --- a/target/arm/cpu.c +++ b/target/arm/cpu.c @@ -25,6 +25,8 @@ #include "qemu/module.h" #include "qapi/error.h" #include "qapi/visitor.h" +#include "qapi/qmp/qdict.h" +#include "qom/qom-qobject.h" #include "cpu.h" #include "internals.h" #include "exec/exec-all.h" @@ -1515,6 +1517,45 @@ static const CPUFeatureDep feature_dependencies[] = =3D { }, }; =20 +static char *strtolower(char *src) +{ + char *start =3D src; + + for (; *src; ++src) { + *src =3D tolower(*src); + } + + return start; +} + +void arm_cpu_features_to_dict(ARMCPU *cpu, QDict *features) +{ + Object *obj =3D OBJECT(cpu); + const char *name; + ObjectProperty *prop; + bool is_32bit =3D !arm_feature(&cpu->env, ARM_FEATURE_AARCH64); + int i; + + for (i =3D 0; i < ARRAY_SIZE(cpu_features); ++i) { + if (is_32bit !=3D cpu_features[i].is_32bit) { + continue; + } + + name =3D cpu_features[i].name; + prop =3D object_property_find(obj, name, NULL); + if (prop) { + QObject *value; + g_autofree char *tmp; + + assert(prop->get); + value =3D object_property_get_qobject(obj, name, &error_abort); + tmp =3D strtolower(g_strdup(name)); + + qdict_put_obj(features, tmp, value); + } + } +} + static void arm_cpu_get_bit_prop(Object *obj, Visitor *v, const char *name, void *opaque, Error **errp) { diff --git a/target/arm/cpu.h b/target/arm/cpu.h index 5d8074d03b..da68b7f8f4 100644 --- a/target/arm/cpu.h +++ b/target/arm/cpu.h @@ -3933,4 +3933,6 @@ static inline bool isar_feature_any_tts2uxn(const ARM= ISARegisters *id) #define cpu_isar_feature(name, cpu) \ ({ ARMCPU *cpu_ =3D (cpu); isar_feature_##name(&cpu_->isar); }) =20 +void arm_cpu_features_to_dict(ARMCPU *cpu, QDict *features); + #endif diff --git a/target/arm/monitor.c b/target/arm/monitor.c index ba6e01abd0..f8eb29efec 100644 --- a/target/arm/monitor.c +++ b/target/arm/monitor.c @@ -225,6 +225,8 @@ CpuModelExpansionInfo *qmp_query_cpu_model_expansion(Cp= uModelExpansionType type, } } =20 + arm_cpu_features_to_dict(ARM_CPU(obj), qdict_out); + if (!qdict_size(qdict_out)) { qobject_unref(qdict_out); } else { --=20 2.18.4