GICv3 isn't supported on aarch64/HVF, but GICv2 is. Signed-off-by: Philippe Mathieu-Daudé <phi...@linaro.org> --- RFC: Test eventually timeouts :(
tests/qtest/migration/framework.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/tests/qtest/migration/framework.c b/tests/qtest/migration/framework.c index 5629b8ba4e3..30808de14e0 100644 --- a/tests/qtest/migration/framework.c +++ b/tests/qtest/migration/framework.c @@ -266,7 +266,7 @@ int migrate_start(QTestState **from, QTestState **to, const char *uri, } else if (strcmp(arch, "aarch64") == 0) { memory_size = "150M"; machine_alias = "virt"; - machine_opts = "gic-version=3"; + machine_opts = env->has_hvf ? "gic-version=2" : "gic-version=3"; arch_opts = g_strdup_printf("-cpu max -kernel %s", bootpath); start_address = ARM_TEST_MEM_START; end_address = ARM_TEST_MEM_END; @@ -303,6 +303,8 @@ int migrate_start(QTestState **from, QTestState **to, const char *uri, } else { accel_args = "kvm"; } + } else if (env->has_hvf) { + accel_args = "hvf"; } else { assert(env->has_tcg); accel_args = "tcg"; -- 2.47.1