From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from [140.186.70.92] (port=37131 helo=eggs.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1PZkDg-0002d0-UZ for qemu-devel@nongnu.org; Mon, 03 Jan 2011 08:13:05 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1PZkDf-0000Ne-GY for qemu-devel@nongnu.org; Mon, 03 Jan 2011 08:13:04 -0500 Received: from fmmailgate01.web.de ([217.72.192.221]:49338) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1PZkDf-0000NP-2x for qemu-devel@nongnu.org; Mon, 03 Jan 2011 08:13:03 -0500 Message-ID: <4D21CB5C.4000406@web.de> Date: Mon, 03 Jan 2011 14:13:00 +0100 From: Jan Kiszka MIME-Version: 1.0 References: <4721707c3f684689860b046cfb0cacc38a29f287.1294043582.git.jan.kiszka@web.de> In-Reply-To: <4721707c3f684689860b046cfb0cacc38a29f287.1294043582.git.jan.kiszka@web.de> Content-Type: text/plain; charset=ISO-8859-15 Content-Transfer-Encoding: 7bit Sender: jan.kiszka@web.de Subject: [Qemu-devel] [PATCH v3 05/17] x86: Optionally dump code bytes on cpu_dump_state List-Id: qemu-devel.nongnu.org List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: Avi Kivity , Marcelo Tosatti Cc: qemu-devel@nongnu.org, kvm@vger.kernel.org From: Jan Kiszka Introduce the cpu_dump_state flag CPU_DUMP_CODE and implement it for x86. This writes out the code bytes around the current instruction pointer. Make use of this feature in KVM to help debugging fatal vm exits. Signed-off-by: Jan Kiszka --- Argh, the broken qemu-user build led me to check my own patch. Changes in v3: - fix qemu-user build by using proper address type cpu-all.h | 2 ++ kvm-all.c | 4 ++-- target-i386/helper.c | 21 +++++++++++++++++++++ 3 files changed, 25 insertions(+), 2 deletions(-) diff --git a/cpu-all.h b/cpu-all.h index 4ce4e83..ffbd6a4 100644 --- a/cpu-all.h +++ b/cpu-all.h @@ -765,6 +765,8 @@ int page_check_range(target_ulong start, target_ulong len, int flags); CPUState *cpu_copy(CPUState *env); CPUState *qemu_get_cpu(int cpu); +#define CPU_DUMP_CODE 0x00010000 + void cpu_dump_state(CPUState *env, FILE *f, fprintf_function cpu_fprintf, int flags); void cpu_dump_statistics(CPUState *env, FILE *f, fprintf_function cpu_fprintf, diff --git a/kvm-all.c b/kvm-all.c index ad1d0a8..ef2ca3b 100644 --- a/kvm-all.c +++ b/kvm-all.c @@ -791,7 +791,7 @@ static int kvm_handle_internal_error(CPUState *env, struct kvm_run *run) if (run->internal.suberror == KVM_INTERNAL_ERROR_EMULATION) { fprintf(stderr, "emulation failure\n"); if (!kvm_arch_stop_on_emulation_error(env)) { - cpu_dump_state(env, stderr, fprintf, 0); + cpu_dump_state(env, stderr, fprintf, CPU_DUMP_CODE); return 0; } } @@ -953,7 +953,7 @@ void kvm_cpu_exec(CPUState *env) } while (ret > 0); if (ret < 0) { - cpu_dump_state(env, stderr, fprintf, 0); + cpu_dump_state(env, stderr, fprintf, CPU_DUMP_CODE); vm_stop(0); env->exit_request = 1; } diff --git a/target-i386/helper.c b/target-i386/helper.c index adf9542..fa37da3 100644 --- a/target-i386/helper.c +++ b/target-i386/helper.c @@ -249,6 +249,9 @@ done: cpu_fprintf(f, "\n"); } +#define DUMP_CODE_BYTES_TOTAL 50 +#define DUMP_CODE_BYTES_BACKWARD 20 + void cpu_dump_state(CPUState *env, FILE *f, fprintf_function cpu_fprintf, int flags) { @@ -434,6 +437,24 @@ void cpu_dump_state(CPUState *env, FILE *f, fprintf_function cpu_fprintf, cpu_fprintf(f, " "); } } + if (flags & CPU_DUMP_CODE) { + target_ulong base = env->segs[R_CS].base + env->eip; + target_ulong offs = MIN(env->eip, DUMP_CODE_BYTES_BACKWARD); + uint8_t code; + char codestr[3]; + + cpu_fprintf(f, "Code="); + for (i = 0; i < DUMP_CODE_BYTES_TOTAL; i++) { + if (cpu_memory_rw_debug(env, base - offs + i, &code, 1, 0) == 0) { + snprintf(codestr, sizeof(codestr), "%02x", code); + } else { + snprintf(codestr, sizeof(codestr), "??"); + } + cpu_fprintf(f, "%s%s%s%s", i > 0 ? " ": "", + i == offs ? "<" : "", codestr, i == offs ? ">" : ""); + } + cpu_fprintf(f, "\n"); + } } /***********************************************************/