e75eba82c9
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 <zhang.zhanghailiang@huawei.com> Signed-off-by: Peng Liang <liangpeng10@huawei.com> (cherry-picked from commit e39f3e8e4d945a87a936388204b3125041da4032)
91 lines
2.8 KiB
Diff
91 lines
2.8 KiB
Diff
From 5d9d03aee0407e27f38ec3e4996c9312d8a81f57 Mon Sep 17 00:00:00 2001
|
|
From: Peng Liang <liangpeng10@huawei.com>
|
|
Date: Thu, 6 Aug 2020 16:14:58 +0800
|
|
Subject: [PATCH] target/arm: Add CPU features to query-cpu-model-expansion
|
|
|
|
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 <zhang.zhanghailiang@huawei.com>
|
|
Signed-off-by: Peng Liang <liangpeng10@huawei.com>
|
|
(cherry-picked from commit e39f3e8e4d945a87a936388204b3125041da4032)
|
|
---
|
|
target/arm/cpu.c | 27 +++++++++++++++++++++++++++
|
|
target/arm/cpu.h | 2 ++
|
|
target/arm/monitor.c | 2 ++
|
|
3 files changed, 31 insertions(+)
|
|
|
|
diff --git a/target/arm/cpu.c b/target/arm/cpu.c
|
|
index db46afba7b..dcf9f49ed3 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"
|
|
@@ -1403,6 +1405,31 @@ static const CPUFeatureDep feature_dependencies[] = {
|
|
},
|
|
};
|
|
|
|
+void arm_cpu_features_to_dict(ARMCPU *cpu, QDict *features)
|
|
+{
|
|
+ Object *obj = OBJECT(cpu);
|
|
+ const char *name;
|
|
+ ObjectProperty *prop;
|
|
+ bool is_32bit = !arm_feature(&cpu->env, ARM_FEATURE_AARCH64);
|
|
+ int i;
|
|
+
|
|
+ for (i = 0; i < ARRAY_SIZE(cpu_features); ++i) {
|
|
+ if (is_32bit != cpu_features[i].is_32bit) {
|
|
+ continue;
|
|
+ }
|
|
+
|
|
+ name = cpu_features[i].name;
|
|
+ prop = object_property_find(obj, name, NULL);
|
|
+ if (prop) {
|
|
+ QObject *value;
|
|
+
|
|
+ assert(prop->get);
|
|
+ value = object_property_get_qobject(obj, name, &error_abort);
|
|
+ qdict_put_obj(features, name, 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 7bb481fb4d..068c3fa2ad 100644
|
|
--- a/target/arm/cpu.h
|
|
+++ b/target/arm/cpu.h
|
|
@@ -3692,4 +3692,6 @@ static inline bool isar_feature_any_pmu_8_1(const ARMISARegisters *id)
|
|
#define cpu_isar_feature(name, cpu) \
|
|
({ ARMCPU *cpu_ = (cpu); isar_feature_##name(&cpu_->isar); })
|
|
|
|
+void arm_cpu_features_to_dict(ARMCPU *cpu, QDict *features);
|
|
+
|
|
#endif
|
|
diff --git a/target/arm/monitor.c b/target/arm/monitor.c
|
|
index e2b1d117a4..7c2ff3c06e 100644
|
|
--- a/target/arm/monitor.c
|
|
+++ b/target/arm/monitor.c
|
|
@@ -219,6 +219,8 @@ CpuModelExpansionInfo *qmp_query_cpu_model_expansion(CpuModelExpansionType type,
|
|
}
|
|
}
|
|
|
|
+ arm_cpu_features_to_dict(ARM_CPU(obj), qdict_out);
|
|
+
|
|
if (!qdict_size(qdict_out)) {
|
|
qobject_unref(qdict_out);
|
|
} else {
|
|
--
|
|
2.23.0
|
|
|