tests: arm-cpu-features: use qtest_has_kvm() API
and drop custom function that were doing the job Signed-off-by: Igor Mammedov <imammedo@redhat.com> Message-Id: <20210902113551.461632-14-imammedo@redhat.com> Reviewed-by: Michael S. Tsirkin <mst@redhat.com> Signed-off-by: Michael S. Tsirkin <mst@redhat.com>
This commit is contained in:
parent
709611cb23
commit
07e6ed2c79
|
@ -26,21 +26,6 @@
|
||||||
" 'arguments': { 'type': 'full', "
|
" 'arguments': { 'type': 'full', "
|
||||||
#define QUERY_TAIL "}}"
|
#define QUERY_TAIL "}}"
|
||||||
|
|
||||||
static bool kvm_enabled(QTestState *qts)
|
|
||||||
{
|
|
||||||
QDict *resp, *qdict;
|
|
||||||
bool enabled;
|
|
||||||
|
|
||||||
resp = qtest_qmp(qts, "{ 'execute': 'query-kvm' }");
|
|
||||||
g_assert(qdict_haskey(resp, "return"));
|
|
||||||
qdict = qdict_get_qdict(resp, "return");
|
|
||||||
g_assert(qdict_haskey(qdict, "enabled"));
|
|
||||||
enabled = qdict_get_bool(qdict, "enabled");
|
|
||||||
qobject_unref(resp);
|
|
||||||
|
|
||||||
return enabled;
|
|
||||||
}
|
|
||||||
|
|
||||||
static QDict *do_query_no_props(QTestState *qts, const char *cpu_type)
|
static QDict *do_query_no_props(QTestState *qts, const char *cpu_type)
|
||||||
{
|
{
|
||||||
return qtest_qmp(qts, QUERY_HEAD "'model': { 'name': %s }"
|
return qtest_qmp(qts, QUERY_HEAD "'model': { 'name': %s }"
|
||||||
|
@ -506,14 +491,6 @@ static void test_query_cpu_model_expansion_kvm(const void *data)
|
||||||
|
|
||||||
qts = qtest_init(MACHINE_KVM "-cpu max");
|
qts = qtest_init(MACHINE_KVM "-cpu max");
|
||||||
|
|
||||||
/*
|
|
||||||
* These tests target the 'host' CPU type, so KVM must be enabled.
|
|
||||||
*/
|
|
||||||
if (!kvm_enabled(qts)) {
|
|
||||||
qtest_quit(qts);
|
|
||||||
return;
|
|
||||||
}
|
|
||||||
|
|
||||||
/* Enabling and disabling kvm-no-adjvtime should always work. */
|
/* Enabling and disabling kvm-no-adjvtime should always work. */
|
||||||
assert_has_feature_disabled(qts, "host", "kvm-no-adjvtime");
|
assert_has_feature_disabled(qts, "host", "kvm-no-adjvtime");
|
||||||
assert_set_feature(qts, "host", "kvm-no-adjvtime", true);
|
assert_set_feature(qts, "host", "kvm-no-adjvtime", true);
|
||||||
|
@ -637,7 +614,11 @@ int main(int argc, char **argv)
|
||||||
* order avoid attempting to run an AArch32 QEMU with KVM on
|
* order avoid attempting to run an AArch32 QEMU with KVM on
|
||||||
* AArch64 hosts. That won't work and isn't easy to detect.
|
* AArch64 hosts. That won't work and isn't easy to detect.
|
||||||
*/
|
*/
|
||||||
if (g_str_equal(qtest_get_arch(), "aarch64")) {
|
if (g_str_equal(qtest_get_arch(), "aarch64") && qtest_has_accel("kvm")) {
|
||||||
|
/*
|
||||||
|
* This tests target the 'host' CPU type, so register it only if
|
||||||
|
* KVM is available.
|
||||||
|
*/
|
||||||
qtest_add_data_func("/arm/kvm/query-cpu-model-expansion",
|
qtest_add_data_func("/arm/kvm/query-cpu-model-expansion",
|
||||||
NULL, test_query_cpu_model_expansion_kvm);
|
NULL, test_query_cpu_model_expansion_kvm);
|
||||||
}
|
}
|
||||||
|
|
Loading…
Reference in New Issue