SYS-OSS/FRET-qemu
4
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

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

Browse Source 
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>
This commit is contained in:
Philippe Mathieu-Daudé 2025-01-27 11:26:10 +01:00 committed by Nicholas Piggin
parent 720c2f2d53
commit 30de74bda7
1 changed files with 2 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
target/ppc/excp_helper.c
View File

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