[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PATCH 06/15] target/ppc: Ensure powerpc_checkstop() is only called unde
From: |
Philippe Mathieu-Daudé |
Subject: |
[PATCH 06/15] target/ppc: Ensure powerpc_checkstop() is only called under TCG |
Date: |
Thu, 23 Jan 2025 22:56:00 +0100 |
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());
powerpc_checkstop(env, "machine check with MSR[ME]=0");
-#endif
}
static void powerpc_excp_40x(PowerPCCPU *cpu, int excp)
--
2.47.1
- [PATCH 00/15] target/ppc: Move TCG code from excp_helper.c to tcg-excp_helper.c, Philippe Mathieu-Daudé, 2025/01/23
- [RFC PATCH 01/15] hw/ppc/spapr: Restrict CONFER hypercall to TCG, Philippe Mathieu-Daudé, 2025/01/23
- [PATCH 02/15] hw/ppc/spapr: Restrict part of PAGE_INIT hypercall to TCG, Philippe Mathieu-Daudé, 2025/01/23
- [PATCH 03/15] target/ppc: Make ppc_ldl_code() declaration public, Philippe Mathieu-Daudé, 2025/01/23
- [PATCH 04/15] target/ppc: Move TCG specific exception handlers to tcg-excp_helper.c, Philippe Mathieu-Daudé, 2025/01/23
- [PATCH 05/15] target/ppc: Move ppc_ldl_code() to tcg-excp_helper.c, Philippe Mathieu-Daudé, 2025/01/23
- [PATCH 06/15] target/ppc: Ensure powerpc_checkstop() is only called under TCG,
Philippe Mathieu-Daudé <=
- [PATCH 07/15] target/ppc: Restrict powerpc_checkstop() to TCG, Philippe Mathieu-Daudé, 2025/01/23
- [PATCH 08/15] target/ppc: Remove raise_exception_ra(), Philippe Mathieu-Daudé, 2025/01/23
- [PATCH 09/15] target/ppc: Restrict exception helpers to TCG, Philippe Mathieu-Daudé, 2025/01/23
- [PATCH 10/15] target/ppc: Restrict ppc_tcg_hv_emu() to TCG, Philippe Mathieu-Daudé, 2025/01/23
- [PATCH 11/15] target/ppc: Restrict various common helpers to TCG, Philippe Mathieu-Daudé, 2025/01/23
- [PATCH 12/15] target/ppc: Fix style in excp_helper.c, Philippe Mathieu-Daudé, 2025/01/23
- [PATCH 14/15] target/ppc: Restrict various system helpers to TCG, Philippe Mathieu-Daudé, 2025/01/23
- [PATCH 13/15] target/ppc: Make powerpc_excp() prototype public, Philippe Mathieu-Daudé, 2025/01/23
- [PATCH 15/15] target/ppc: Restrict ATTN helper to TCG, Philippe Mathieu-Daudé, 2025/01/23