@samitouri / QOSamiQemu / commits / 1bfce83996

target/arm: Restrict arm_do_plugin_vcpu_discon_cb() to TCG

So far TCG plugins can only be used when TCG is available. Move the arm_do_plugin_vcpu_discon_cb() call within the 'if tcg_enabled' block and wrap the definition with #ifdef'ry. Signed-off-by: Philippe Mathieu-Daudé <philmd@oss.qualcomm.com> Reviewed-by: Pierrick Bouvier <pierrick.bouvier@oss.qualcomm.com> Message-id: 20260814080507.23196-1-philmd@oss.qualcomm.com Signed-off-by: Peter Maydell <peter.maydell@linaro.org>

Philippe Mathieu-Daudé committed Aug 18, 2026 at 10:39 UTC 1bfce83996929033fa14a123967bf40976888661
1 file changed +4 -2
target/arm/helper.c
+4 -2
@@ -8915,6 +8915,7 @@ static void take_aarch32_exception(CPUARMState *env, int new_mode,
8915 }
8916 }
8917
8918 +#ifdef CONFIG_TCG
8919 void arm_do_plugin_vcpu_discon_cb(CPUState *cs, uint64_t from)
8920 {
8921 switch (cs->exception_index) {
@@ -8932,6 +8933,7 @@ void arm_do_plugin_vcpu_discon_cb(CPUState *cs, uint64_t from)
8933 qemu_plugin_vcpu_exception_cb(cs, from);
8934 }
8935 }
8936 +#endif
8937
8938 static void arm_cpu_do_interrupt_aarch32_hyp(CPUState *cs)
8939 {
@@ -9677,9 +9679,9 @@ void arm_cpu_do_interrupt(CPUState *cs)
9679
9680 if (tcg_enabled()) {
9681 cpu_set_interrupt(cs, CPU_INTERRUPT_EXITTB);
9680 - }
9682
9682 - arm_do_plugin_vcpu_discon_cb(cs, last_pc);
9683 + arm_do_plugin_vcpu_discon_cb(cs, last_pc);
9684 + }
9685 }
9686 #endif /* !CONFIG_USER_ONLY */
9687