]> www.infradead.org Git - users/dwmw2/qemu.git/commitdiff
target/arm: wrap psci call with tcg_enabled
authorClaudio Fontana <cfontana@suse.de>
Mon, 13 Feb 2023 20:29:01 +0000 (17:29 -0300)
committerPeter Maydell <peter.maydell@linaro.org>
Thu, 16 Feb 2023 16:08:25 +0000 (16:08 +0000)
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>
target/arm/helper.c

index 509e674b0f0f9845eb1a4d79af5cfc01ef07cd7d..2d38c3ed7aaa9bf38fb0593f7427b66fa35d91e4 100644 (file)
@@ -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;