diff options
| author | Claudio Fontana <cfontana@suse.de> | 2023-02-13 17:29:01 -0300 |
|---|---|---|
| committer | Peter Maydell <peter.maydell@linaro.org> | 2023-02-16 16:08:25 +0000 |
| commit | 0c1aaa66c248b7375112a2d6f5ca3bafaeda0aa5 (patch) | |
| tree | f409f1728c3cc80aa7c16eb5248d4a7645155273 | |
| parent | a06e3a68ba2b0f51d28f83e94f8266811c0ba05c (diff) | |
| download | focaccia-qemu-0c1aaa66c248b7375112a2d6f5ca3bafaeda0aa5.tar.gz focaccia-qemu-0c1aaa66c248b7375112a2d6f5ca3bafaeda0aa5.zip | |
target/arm: wrap psci call with tcg_enabled
for "all" builds (tcg + kvm), we want to avoid doing the psci check if tcg is built-in, but not enabled. Signed-off-by: Claudio Fontana <cfontana@suse.de> Reviewed-by: Richard Henderson <richard.henderson@linaro.org> Signed-off-by: Fabiano Rosas <farosas@suse.de> Tested-by: Philippe Mathieu-Daudé <philmd@linaro.org> Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
| -rw-r--r-- | target/arm/helper.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/target/arm/helper.c b/target/arm/helper.c index 509e674b0f..2d38c3ed7a 100644 --- a/target/arm/helper.c +++ b/target/arm/helper.c @@ -22,6 +22,7 @@ #include "hw/irq.h" #include "sysemu/cpu-timers.h" #include "sysemu/kvm.h" +#include "sysemu/tcg.h" #include "qapi/qapi-commands-machine-target.h" #include "qapi/error.h" #include "qemu/guest-random.h" @@ -11063,7 +11064,7 @@ void arm_cpu_do_interrupt(CPUState *cs) env->exception.syndrome); } - if (arm_is_psci_call(cpu, cs->exception_index)) { + if (tcg_enabled() && arm_is_psci_call(cpu, cs->exception_index)) { arm_handle_psci_call(cpu); qemu_log_mask(CPU_LOG_INT, "...handled as PSCI call\n"); return; |