This is a slightly adjusted (for 2009-01-04 SVN) "reset on tripple fault patch" Originally from: Subject: [Qemu-devel] Re: [PATCH] x86: Reboot CPU on triple fault - Version 8 Message-ID: Date: Tue, 27 May 2008 18:17:18 +0200 From: Jan Kiszka Index: exec.c =================================================================== --- exec.c (revision 6159) +++ exec.c (working copy) @@ -1571,6 +1571,8 @@ #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", Index: target-i386/helper.c =================================================================== --- target-i386/helper.c (revision 6159) +++ target-i386/helper.c (working copy) @@ -418,6 +418,11 @@ { int i; + if (loglevel & 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); Index: target-i386/op_helper.c =================================================================== --- target-i386/op_helper.c (revision 6159) +++ target-i386/op_helper.c (working copy) @@ -1244,6 +1244,9 @@ } } +/* This should come from sysemu.h - if we could include it here... */ +void qemu_system_reset_request(void); + /* * Check nested exceptions and change to double or triple fault if * needed. It should only be called, if this is not an interrupt. @@ -1261,9 +1264,19 @@ fprintf(logfile, "check_exception old: 0x%x new 0x%x\n", env->old_exception, intno); - if (env->old_exception == EXCP08_DBLE) - cpu_abort(env, "triple fault"); +#if !defined(CONFIG_USER_ONLY) + if (env->old_exception == EXCP08_DBLE) { + if (env->intercept) + helper_vmexit(SVM_EXIT_SHUTDOWN, 0); + if (loglevel & CPU_LOG_RESET) + fprintf(logfile, "Triple fault\n"); + + qemu_system_reset_request(); + return EXCP_HLT; + } +#endif + if ((first_contributory && second_contributory) || (env->old_exception == EXCP0E_PAGE && (second_contributory || (intno == EXCP0E_PAGE)))) { Index: cpu-all.h =================================================================== --- cpu-all.h (revision 6159) +++ cpu-all.h (working copy) @@ -815,6 +815,7 @@ #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 {