target/ppc: improve checkstop logging

Change the logging not to print to stderr as well, because a
checkstop is a guest error (or perhaps a simulated machine error)
rather than a QEMU error, so send it to the log.

Update the checkstop message, and log CPU registers too.

Reviewed-by: Richard Henderson <richard.henderson@linaro.org>
Reviewed-by: Glenn Miles <milesg@linux.ibm.com>
Signed-off-by: Nicholas Piggin <npiggin@gmail.com>
This commit is contained in:
Nicholas Piggin 2024-03-12 04:33:18 +10:00
parent cce7aee8dd
commit 9728fb5c22

View File

@ -430,17 +430,19 @@ static void powerpc_mcheck_checkstop(CPUPPCState *env)
/* KVM guests always have MSR[ME] enabled */ /* KVM guests always have MSR[ME] enabled */
#ifdef CONFIG_TCG #ifdef CONFIG_TCG
CPUState *cs = env_cpu(env); CPUState *cs = env_cpu(env);
FILE *f;
if (FIELD_EX64(env->msr, MSR, ME)) { if (FIELD_EX64(env->msr, MSR, ME)) {
return; return;
} }
/* Machine check exception is not enabled. Enter checkstop state. */ f = qemu_log_trylock();
fprintf(stderr, "Machine check while not allowed. " if (f) {
"Entering checkstop state\n"); fprintf(f, "Entering checkstop state: "
if (qemu_log_separate()) { "machine check with MSR[ME]=0\n");
qemu_log("Machine check while not allowed. " cpu_dump_state(cs, f, CPU_DUMP_FPU | CPU_DUMP_CCOP);
"Entering checkstop state\n"); qemu_log_unlock(f);
}
/* /*
* This stops the machine and logs CPU state without killing QEMU * This stops the machine and logs CPU state without killing QEMU