[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[RFC PATCH v3 4/6] tests/arm-cpu-features: Check feature default values
From: |
Andrew Jones |
Subject: |
[RFC PATCH v3 4/6] tests/arm-cpu-features: Check feature default values |
Date: |
Mon, 20 Jan 2020 11:10:21 +0100 |
If we know what the default value should be then we can test for
that as well as the feature existence.
Signed-off-by: Andrew Jones <address@hidden>
Reviewed-by: Richard Henderson <address@hidden>
---
tests/qtest/arm-cpu-features.c | 37 +++++++++++++++++++++++++---------
1 file changed, 28 insertions(+), 9 deletions(-)
diff --git a/tests/qtest/arm-cpu-features.c b/tests/qtest/arm-cpu-features.c
index bef3ed24b604..a039e3c8d724 100644
--- a/tests/qtest/arm-cpu-features.c
+++ b/tests/qtest/arm-cpu-features.c
@@ -159,6 +159,25 @@ static bool resp_get_feature(QDict *resp, const char
*feature)
qobject_unref(_resp); \
})
+#define assert_feature(qts, cpu_type, feature, expected_value) \
+({ \
+ QDict *_resp, *_props; \
+ \
+ _resp = do_query_no_props(qts, cpu_type); \
+ g_assert(_resp); \
+ g_assert(resp_has_props(_resp)); \
+ _props = resp_get_props(_resp); \
+ g_assert(qdict_get(_props, feature)); \
+ g_assert(qdict_get_bool(_props, feature) == (expected_value)); \
+ qobject_unref(_resp); \
+})
+
+#define assert_has_feature_enabled(qts, cpu_type, feature) \
+ assert_feature(qts, cpu_type, feature, true)
+
+#define assert_has_feature_disabled(qts, cpu_type, feature) \
+ assert_feature(qts, cpu_type, feature, false)
+
static void assert_type_full(QTestState *qts)
{
const char *error;
@@ -405,16 +424,16 @@ static void test_query_cpu_model_expansion(const void
*data)
assert_error(qts, "host", "The CPU type 'host' requires KVM", NULL);
/* Test expected feature presence/absence for some cpu types */
- assert_has_feature(qts, "max", "pmu");
- assert_has_feature(qts, "cortex-a15", "pmu");
+ assert_has_feature_enabled(qts, "max", "pmu");
+ assert_has_feature_enabled(qts, "cortex-a15", "pmu");
assert_has_not_feature(qts, "cortex-a15", "aarch64");
if (g_str_equal(qtest_get_arch(), "aarch64")) {
- assert_has_feature(qts, "max", "aarch64");
- assert_has_feature(qts, "max", "sve");
- assert_has_feature(qts, "max", "sve128");
- assert_has_feature(qts, "cortex-a57", "pmu");
- assert_has_feature(qts, "cortex-a57", "aarch64");
+ assert_has_feature_enabled(qts, "max", "aarch64");
+ assert_has_feature_enabled(qts, "max", "sve");
+ assert_has_feature_enabled(qts, "max", "sve128");
+ assert_has_feature_enabled(qts, "cortex-a57", "pmu");
+ assert_has_feature_enabled(qts, "cortex-a57", "aarch64");
sve_tests_default(qts, "max");
@@ -451,8 +470,8 @@ static void test_query_cpu_model_expansion_kvm(const void
*data)
QDict *resp;
char *error;
- assert_has_feature(qts, "host", "aarch64");
- assert_has_feature(qts, "host", "pmu");
+ assert_has_feature_enabled(qts, "host", "aarch64");
+ assert_has_feature_enabled(qts, "host", "pmu");
assert_error(qts, "cortex-a15",
"We cannot guarantee the CPU type 'cortex-a15' works "
--
2.21.1
- [RFC PATCH v3 0/6] target/arm/kvm: Adjust virtual time, Andrew Jones, 2020/01/20
- [RFC PATCH v3 1/6] target/arm/kvm: trivial: Clean up header documentation, Andrew Jones, 2020/01/20
- [RFC PATCH v3 4/6] tests/arm-cpu-features: Check feature default values,
Andrew Jones <=
- [RFC PATCH v3 2/6] hw/arm/virt: Add missing 5.0 options call to 4.2 options, Andrew Jones, 2020/01/20
- [RFC PATCH v3 6/6] target/arm/cpu: Add the kvm-no-adjvtime CPU property, Andrew Jones, 2020/01/20
- [RFC PATCH v3 5/6] target/arm/kvm: Implement virtual time adjustment, Andrew Jones, 2020/01/20
- [RFC PATCH v3 3/6] target/arm/kvm64: kvm64 cpus have timer registers, Andrew Jones, 2020/01/20
- Re: [RFC PATCH v3 0/6] target/arm/kvm: Adjust virtual time, Peter Maydell, 2020/01/30
- Re: [RFC PATCH v3 0/6] target/arm/kvm: Adjust virtual time, Andrea Bolognani, 2020/01/31