|
@@ -509,6 +509,7 @@ static void test_query_cpu_model_expansion_kvm(const void *data)
|
|
|
assert_set_feature(qts, "host", "kvm-no-adjvtime", false);
|
|
|
|
|
|
if (g_str_equal(qtest_get_arch(), "aarch64")) {
|
|
|
+ bool kvm_supports_pmu;
|
|
|
bool kvm_supports_steal_time;
|
|
|
bool kvm_supports_sve;
|
|
|
char max_name[8], name[8];
|
|
@@ -537,11 +538,6 @@ static void test_query_cpu_model_expansion_kvm(const void *data)
|
|
|
|
|
|
assert_has_feature_enabled(qts, "host", "aarch64");
|
|
|
|
|
|
- /* Enabling and disabling pmu should always work. */
|
|
|
- assert_has_feature_enabled(qts, "host", "pmu");
|
|
|
- assert_set_feature(qts, "host", "pmu", false);
|
|
|
- assert_set_feature(qts, "host", "pmu", true);
|
|
|
-
|
|
|
/*
|
|
|
* Some features would be enabled by default, but they're disabled
|
|
|
* because this instance of KVM doesn't support them. Test that the
|
|
@@ -551,11 +547,18 @@ static void test_query_cpu_model_expansion_kvm(const void *data)
|
|
|
assert_has_feature(qts, "host", "sve");
|
|
|
|
|
|
resp = do_query_no_props(qts, "host");
|
|
|
+ kvm_supports_pmu = resp_get_feature(resp, "pmu");
|
|
|
kvm_supports_steal_time = resp_get_feature(resp, "kvm-steal-time");
|
|
|
kvm_supports_sve = resp_get_feature(resp, "sve");
|
|
|
vls = resp_get_sve_vls(resp);
|
|
|
qobject_unref(resp);
|
|
|
|
|
|
+ if (kvm_supports_pmu) {
|
|
|
+ /* If we have pmu then we should be able to toggle it. */
|
|
|
+ assert_set_feature(qts, "host", "pmu", false);
|
|
|
+ assert_set_feature(qts, "host", "pmu", true);
|
|
|
+ }
|
|
|
+
|
|
|
if (kvm_supports_steal_time) {
|
|
|
/* If we have steal-time then we should be able to toggle it. */
|
|
|
assert_set_feature(qts, "host", "kvm-steal-time", false);
|