| Message ID | 20250127102620.39159-7-philmd@linaro.org (mailing list archive) |
|---|---|
| State | New |
| Headers | show |
| Series | target/ppc: Move TCG code from excp_helper.c to tcg-excp_helper.c | expand |
On 1/27/25 15:56, Philippe Mathieu-Daudé wrote: > Signed-off-by: Philippe Mathieu-Daudé <philmd@linaro.org> > --- > target/ppc/excp_helper.c | 6 ++---- > 1 file changed, 2 insertions(+), 4 deletions(-) > > diff --git a/target/ppc/excp_helper.c b/target/ppc/excp_helper.c > index 8956466db1d..b08cd53688c 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()); Shouldn't this be a no-op if not TCG ? Nick, please advise ? regards, Harsh > powerpc_checkstop(env, "machine check with MSR[ME]=0"); > -#endif > } > > static void powerpc_excp_40x(PowerPCCPU *cpu, int excp)
On 1/28/25 12:13, Harsh Prateek Bora wrote: > > > On 1/27/25 15:56, Philippe Mathieu-Daudé wrote: >> Signed-off-by: Philippe Mathieu-Daudé <philmd@linaro.org> >> --- >> target/ppc/excp_helper.c | 6 ++---- >> 1 file changed, 2 insertions(+), 4 deletions(-) >> >> diff --git a/target/ppc/excp_helper.c b/target/ppc/excp_helper.c >> index 8956466db1d..b08cd53688c 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()); > > Shouldn't this be a no-op if not TCG ? > > Nick, please advise ? > Also, patch title needs update - it's powerpc_mcheck_checkstop. > regards, > Harsh >> powerpc_checkstop(env, "machine check with MSR[ME]=0"); >> -#endif >> } >> static void powerpc_excp_40x(PowerPCCPU *cpu, int excp) >
diff --git a/target/ppc/excp_helper.c b/target/ppc/excp_helper.c index 8956466db1d..b08cd53688c 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)
Signed-off-by: Philippe Mathieu-Daudé <philmd@linaro.org> --- target/ppc/excp_helper.c | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-)