From: Philippe Mathieu-Daudé <philmd@linaro.org>
Date: Mon, 27 Jan 2025 10:26:10 +0000 (+0100)
Subject: target/ppc: Ensure powerpc_mcheck_checkstop() is only called under TCG
X-Git-Tag: v10.0.0-rc0~10^2~26
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=30de74bda77fd5eb7c7dc9c50ed4ea39bbc367b6;p=thirdparty%2Fqemu.git

target/ppc: Ensure powerpc_mcheck_checkstop() is only called under TCG

Signed-off-by: Philippe Mathieu-Daudé <philmd@linaro.org>
Message-ID: <20250127102620.39159-7-philmd@linaro.org>
Signed-off-by: Nicholas Piggin <npiggin@gmail.com>
---

diff --git a/target/ppc/excp_helper.c b/target/ppc/excp_helper.c
index 8956466db1..b08cd53688 100644
--- a/target/ppc/excp_helper.c
+++ b/target/ppc/excp_helper.c
@@ -19,6 +19,7 @@
 #include "qemu/osdep.h"
 #include "qemu/main-loop.h"
 #include "qemu/log.h"
+#include "system/tcg.h"
 #include "system/system.h"
 #include "system/runstate.h"
 #include "cpu.h"
@@ -30,7 +31,6 @@
 #include "trace.h"
 
 #ifdef CONFIG_TCG
-#include "system/tcg.h"
 #include "exec/helper-proto.h"
 #include "exec/cpu_ldst.h"
 #endif
@@ -443,13 +443,11 @@ void helper_attn(CPUPPCState *env)
 static void powerpc_mcheck_checkstop(CPUPPCState *env)
 {
     /* KVM guests always have MSR[ME] enabled */
-#ifdef CONFIG_TCG
     if (FIELD_EX64(env->msr, MSR, ME)) {
         return;
     }
-
+    assert(tcg_enabled());
     powerpc_checkstop(env, "machine check with MSR[ME]=0");
-#endif
 }
 
 static void powerpc_excp_40x(PowerPCCPU *cpu, int excp)