target/arm: Do not expose all -cpu max features to qtests

We're about to move the TCG-only -cpu max configuration code under
CONFIG_TCG. To be able to do that we need to make sure the qtests
still have some cpu configured even when no other accelerator is
available.

Delineate now what is used with TCG-only and what is also used with
qtests to make the subsequent patches cleaner.

Signed-off-by: Fabiano Rosas <farosas@suse.de>
Reviewed-by: Richard Henderson <richard.henderson@linaro.org>
Reviewed-by: Philippe Mathieu-Daudé <philmd@linaro.org>
Message-id: 20230426180013.14814-5-farosas@suse.de
Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
This commit is contained in:
Fabiano Rosas 2023-04-26 15:00:04 -03:00 committed by Peter Maydell
parent 25be21059f
commit fcab465e26
1 changed files with 9 additions and 3 deletions

View File

@ -25,6 +25,8 @@
#include "qemu/module.h"
#include "sysemu/kvm.h"
#include "sysemu/hvf.h"
#include "sysemu/qtest.h"
#include "sysemu/tcg.h"
#include "kvm_arm.h"
#include "hvf_arm.h"
#include "qapi/visitor.h"
@ -1365,10 +1367,14 @@ static void aarch64_max_initfn(Object *obj)
return;
}
/* '-cpu max' for TCG: we currently do this as "A57 with extra things" */
if (tcg_enabled() || qtest_enabled()) {
aarch64_a57_initfn(obj);
}
aarch64_a57_initfn(obj);
aarch64_max_tcg_initfn(obj);
/* '-cpu max' for TCG: we currently do this as "A57 with extra things" */
if (tcg_enabled()) {
aarch64_max_tcg_initfn(obj);
}
}
static const ARMCPUInfo aarch64_cpus[] = {