| Message ID | 20230412121829.14452-5-farosas@suse.de |
|---|---|
| State | New |
| Headers | show |
| Series | target/arm: Allow CONFIG_TCG=n builds | expand |
On 12/4/23 14:18, Fabiano Rosas wrote: > 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> > --- > target/arm/cpu64.c | 12 +++++++++--- > 1 file changed, 9 insertions(+), 3 deletions(-) Nice. Reviewed-by: Philippe Mathieu-Daudé <philmd@linaro.org>
On 4/12/23 13:18, Fabiano Rosas wrote: > 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> > --- > target/arm/cpu64.c | 12 +++++++++--- > 1 file changed, 9 insertions(+), 3 deletions(-) Reviewed-by: Richard Henderson <richard.henderson@linaro.org> r~
diff --git a/target/arm/cpu64.c b/target/arm/cpu64.c index 4537aec141..b3a93e7aa1 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; } + if (tcg_enabled() || qtest_enabled()) { + aarch64_a57_initfn(obj); + } + /* '-cpu max' for TCG: we currently do this as "A57 with extra things" */ - - aarch64_a57_initfn(obj); - aarch64_max_tcg_initfn(obj); + if (tcg_enabled()) { + aarch64_max_tcg_initfn(obj); + } } static const ARMCPUInfo aarch64_cpus[] = {
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> --- target/arm/cpu64.c | 12 +++++++++--- 1 file changed, 9 insertions(+), 3 deletions(-)