diff options
| author | Fabiano Rosas <farosas@suse.de> | 2023-04-26 15:00:04 -0300 |
|---|---|---|
| committer | Peter Maydell <peter.maydell@linaro.org> | 2023-05-02 10:21:32 +0100 |
| commit | fcab465e264e18ca74f0513b8f5b682c3362ed7f (patch) | |
| tree | d36903b268a0378033aee8f5db5395f5b87d7069 | |
| parent | 25be21059f7562b409bc2253fe2760621e2691bb (diff) | |
| download | focaccia-qemu-fcab465e264e18ca74f0513b8f5b682c3362ed7f.tar.gz focaccia-qemu-fcab465e264e18ca74f0513b8f5b682c3362ed7f.zip | |
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>
| -rw-r--r-- | target/arm/cpu64.c | 12 |
1 files changed, 9 insertions, 3 deletions
diff --git a/target/arm/cpu64.c b/target/arm/cpu64.c index e9161522b8..6a6a2ece2b 100644 --- a/target/arm/cpu64.c +++ b/target/arm/cpu64.c @@ -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[] = { |