SYS-OSS/FRET-qemu
4
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

tests/qtest: arm: fix operation in a build without any boards or devices

Browse Source 
ARM/aarch64 are easy to fix because they already have to pass a machine
type by hand.  Just guard the tests with a check that the machine actually
exists.

Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
Reviewed-by: Philippe Mathieu-Daudé <philmd@linaro.org>
Reviewed-by: Thomas Huth <thuth@redhat.com>
Message-ID: <20240509170044.190795-14-pbonzini@redhat.com>
Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
This commit is contained in:
Paolo Bonzini 2024-05-09 19:00:44 +02:00
parent 1b1badf3c5
commit 6bd92a7c62
3 changed files with 14 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
tests/qtest/arm-cpu-features.c
View File

@ -632,6 +632,10 @@ int main(int argc, char **argv)
{ {
g_test_init(&argc, &argv, NULL); g_test_init(&argc, &argv, NULL);
if (!qtest_has_machine("virt")) {
goto out;
}
if (qtest_has_accel("tcg")) { if (qtest_has_accel("tcg")) {
qtest_add_data_func("/arm/query-cpu-model-expansion", qtest_add_data_func("/arm/query-cpu-model-expansion",
NULL, test_query_cpu_model_expansion); NULL, test_query_cpu_model_expansion);

6
tests/qtest/migration-test.c
View File

@ -781,6 +781,12 @@ static int test_migrate_start(QTestState **from, QTestState **to,
kvm_opts = ",dirty-ring-size=4096"; kvm_opts = ",dirty-ring-size=4096";
} }
if (!qtest_has_machine(machine_alias)) {
g_autofree char *msg = g_strdup_printf("machine %s not supported", machine_alias);
g_test_skip(msg);
return -1;
}
machine = resolve_machine_version(machine_alias, QEMU_ENV_SRC, machine = resolve_machine_version(machine_alias, QEMU_ENV_SRC,
QEMU_ENV_DST); QEMU_ENV_DST);

4
tests/qtest/numa-test.c
View File

@ -558,6 +558,9 @@ int main(int argc, char **argv)
} }
if (g_str_equal(arch, "aarch64")) { if (g_str_equal(arch, "aarch64")) {
if (!qtest_has_machine("virt")) {
goto out;
}
g_string_append(args, " -machine virt"); g_string_append(args, " -machine virt");
} }
@ -590,5 +593,6 @@ int main(int argc, char **argv)
aarch64_numa_cpu); aarch64_numa_cpu);
} }
out:
return g_test_run(); return g_test_run();
} }