[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH -v2 1/2] Log reset events
From: |
Jan Kiszka |
Subject: |
[Qemu-devel] [PATCH -v2 1/2] Log reset events |
Date: |
Fri, 16 Jan 2009 12:56:48 +0100 |
User-agent: |
Mozilla/5.0 (X11; U; Linux i686 (x86_64); de; rv:1.8.1.12) Gecko/20080226 SUSE/2.0.0.12-1.1 Thunderbird/2.0.0.12 Mnenhy/0.7.5.666 |
[ Updated to use new log API. ]
Original idea&code by Kevin Wolf, now split-up in two patches and added
more archs.
This patch introduces a flag to log CPU resets. Useful for tracing
unexpected resets (such as those triggered by x86 triple faults).
Signed-off-by: Jan Kiszka <address@hidden>
Acked-by: Kevin Wolf <address@hidden>
---
cpu-all.h | 1 +
exec.c | 2 ++
target-arm/helper.c | 6 ++++++
target-cris/translate.c | 5 +++++
target-i386/helper.c | 5 +++++
target-m68k/helper.c | 5 +++++
target-mips/translate.c | 5 +++++
target-ppc/helper.c | 8 ++++++--
target-sh4/translate.c | 5 +++++
target-sparc/helper.c | 5 +++++
10 files changed, 45 insertions(+), 2 deletions(-)
diff --git a/cpu-all.h b/cpu-all.h
index ee0a6e3..59c686a 100644
--- a/cpu-all.h
+++ b/cpu-all.h
@@ -816,6 +816,7 @@ target_phys_addr_t cpu_get_phys_page_debug(CPUState *env,
target_ulong addr);
#define CPU_LOG_PCALL (1 << 6)
#define CPU_LOG_IOPORT (1 << 7)
#define CPU_LOG_TB_CPU (1 << 8)
+#define CPU_LOG_RESET (1 << 9)
/* define log items */
typedef struct CPULogItem {
diff --git a/exec.c b/exec.c
index faa6333..fa2ebbd 100644
--- a/exec.c
+++ b/exec.c
@@ -1569,6 +1569,8 @@ const CPULogItem cpu_log_items[] = {
#ifdef TARGET_I386
{ CPU_LOG_PCALL, "pcall",
"show protected mode far calls/returns/exceptions" },
+ { CPU_LOG_RESET, "cpu_reset",
+ "show CPU state before CPU resets" },
#endif
#ifdef DEBUG_IOPORT
{ CPU_LOG_IOPORT, "ioport",
diff --git a/target-arm/helper.c b/target-arm/helper.c
index 81663c8..a243d9b 100644
--- a/target-arm/helper.c
+++ b/target-arm/helper.c
@@ -159,6 +159,12 @@ static void cpu_reset_model_id(CPUARMState *env, uint32_t
id)
void cpu_reset(CPUARMState *env)
{
uint32_t id;
+
+ if (qemu_loglevel_mask(CPU_LOG_RESET)) {
+ fprintf(logfile, "CPU Reset (CPU %d)\n", env->cpu_index);
+ cpu_dump_state(env, logfile, fprintf, 0);
+ }
+
id = env->cp15.c0_cpuid;
memset(env, 0, offsetof(CPUARMState, breakpoints));
if (id)
diff --git a/target-cris/translate.c b/target-cris/translate.c
index 2ff6fe2..7e07916 100644
--- a/target-cris/translate.c
+++ b/target-cris/translate.c
@@ -3458,6 +3458,11 @@ CPUCRISState *cpu_cris_init (const char *cpu_model)
void cpu_reset (CPUCRISState *env)
{
+ if (qemu_loglevel_mask(CPU_LOG_RESET)) {
+ fprintf(logfile, "CPU Reset (CPU %d)\n", env->cpu_index);
+ cpu_dump_state(env, logfile, fprintf, 0);
+ }
+
memset(env, 0, offsetof(CPUCRISState, breakpoints));
tlb_flush(env, 1);
diff --git a/target-i386/helper.c b/target-i386/helper.c
index a28ab93..8cdc01f 100644
--- a/target-i386/helper.c
+++ b/target-i386/helper.c
@@ -418,6 +418,11 @@ void cpu_reset(CPUX86State *env)
{
int i;
+ if (qemu_loglevel_mask(CPU_LOG_RESET)) {
+ fprintf(logfile, "CPU Reset (CPU %d)\n", env->cpu_index);
+ cpu_dump_state(env, logfile, fprintf, X86_DUMP_FPU | X86_DUMP_CCOP);
+ }
+
memset(env, 0, offsetof(CPUX86State, breakpoints));
tlb_flush(env, 1);
diff --git a/target-m68k/helper.c b/target-m68k/helper.c
index ce56693..d70e355 100644
--- a/target-m68k/helper.c
+++ b/target-m68k/helper.c
@@ -143,6 +143,11 @@ static int cpu_m68k_set_model(CPUM68KState *env, const
char *name)
void cpu_reset(CPUM68KState *env)
{
+ if (qemu_loglevel_mask(CPU_LOG_RESET)) {
+ fprintf(logfile, "CPU Reset (CPU %d)\n", env->cpu_index);
+ cpu_dump_state(env, logfile, fprintf, 0);
+ }
+
memset(env, 0, offsetof(CPUM68KState, breakpoints));
#if !defined (CONFIG_USER_ONLY)
env->sr = 0x2700;
diff --git a/target-mips/translate.c b/target-mips/translate.c
index 692ea6d..c9b7f5c 100644
--- a/target-mips/translate.c
+++ b/target-mips/translate.c
@@ -8489,6 +8489,11 @@ CPUMIPSState *cpu_mips_init (const char *cpu_model)
void cpu_reset (CPUMIPSState *env)
{
+ if (qemu_loglevel_mask(CPU_LOG_RESET)) {
+ fprintf(logfile, "CPU Reset (CPU %d)\n", env->cpu_index);
+ cpu_dump_state(env, logfile, fprintf, 0);
+ }
+
memset(env, 0, offsetof(CPUMIPSState, breakpoints));
tlb_flush(env, 1);
diff --git a/target-ppc/helper.c b/target-ppc/helper.c
index 2bf7650..613df0b 100644
--- a/target-ppc/helper.c
+++ b/target-ppc/helper.c
@@ -2709,10 +2709,14 @@ void cpu_dump_rfi (target_ulong RA, target_ulong msr)
void cpu_ppc_reset (void *opaque)
{
- CPUPPCState *env;
+ CPUPPCState *env = opaque;
target_ulong msr;
- env = opaque;
+ if (qemu_loglevel_mask(CPU_LOG_RESET)) {
+ fprintf(logfile, "CPU Reset (CPU %d)\n", env->cpu_index);
+ cpu_dump_state(env, logfile, fprintf, 0);
+ }
+
msr = (target_ulong)0;
if (0) {
/* XXX: find a suitable condition to enable the hypervisor mode */
diff --git a/target-sh4/translate.c b/target-sh4/translate.c
index 9137e38..690344a 100644
--- a/target-sh4/translate.c
+++ b/target-sh4/translate.c
@@ -184,6 +184,11 @@ void cpu_dump_state(CPUState * env, FILE * f,
static void cpu_sh4_reset(CPUSH4State * env)
{
+ if (qemu_loglevel_mask(CPU_LOG_RESET)) {
+ fprintf(logfile, "CPU Reset (CPU %d)\n", env->cpu_index);
+ cpu_dump_state(env, logfile, fprintf, 0);
+ }
+
#if defined(CONFIG_USER_ONLY)
env->sr = 0;
#else
diff --git a/target-sparc/helper.c b/target-sparc/helper.c
index d34b837..8598249 100644
--- a/target-sparc/helper.c
+++ b/target-sparc/helper.c
@@ -639,6 +639,11 @@ target_phys_addr_t cpu_get_phys_page_debug(CPUState *env,
target_ulong addr)
void cpu_reset(CPUSPARCState *env)
{
+ if (qemu_loglevel_mask(CPU_LOG_RESET)) {
+ fprintf(logfile, "CPU Reset (CPU %d)\n", env->cpu_index);
+ cpu_dump_state(env, logfile, fprintf, 0);
+ }
+
tlb_flush(env, 1);
env->cwp = 0;
env->wim = 1;
- [Qemu-devel] [RESEND][PATCH 1/2] Log reset events, Jan Kiszka, 2009/01/16
- Re: [Qemu-devel] [RESEND][PATCH 1/2] Log reset events, Laurent Desnogues, 2009/01/16
- [Qemu-devel] Re: [RESEND][PATCH 1/2] Log reset events, Jan Kiszka, 2009/01/16
- [Qemu-devel] [PATCH -v2 1/2] Log reset events,
Jan Kiszka <=
- Re: [Qemu-devel] [PATCH -v2 1/2] Log reset events, Kevin Wolf, 2009/01/16
- Re: [Qemu-devel] [PATCH -v2 1/2] Log reset events, Laurent Desnogues, 2009/01/16
- Re: [Qemu-devel] [PATCH -v2 1/2] Log reset events, Kevin Wolf, 2009/01/16
- Re: [Qemu-devel] [PATCH -v2 1/2] Log reset events, Laurent Desnogues, 2009/01/16
- [Qemu-devel] Re: [PATCH -v2 1/2] Log reset events, Jan Kiszka, 2009/01/16
- [Qemu-devel] Re: [PATCH -v2 1/2] Log reset events, Jan Kiszka, 2009/01/16
- Re: [Qemu-devel] Re: [PATCH -v2 1/2] Log reset events, Kevin Wolf, 2009/01/16
- [Qemu-devel] [PATCH -v3 1/2] Log reset events, Jan Kiszka, 2009/01/16
- Re: [Qemu-devel] [PATCH -v3 1/2] Log reset events, Kevin Wolf, 2009/01/16
- [Qemu-devel] Re: [PATCH -v3 1/2] Log reset events, Jan Kiszka, 2009/01/16