From patchwork Fri Jan 21 20:48:08 2011 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jan Kiszka X-Patchwork-Id: 79941 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from lists.gnu.org (lists.gnu.org [199.232.76.165]) (using TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits)) (Client did not present a certificate) by ozlabs.org (Postfix) with ESMTPS id 81D47B70EE for ; Sat, 22 Jan 2011 08:26:30 +1100 (EST) Received: from localhost ([127.0.0.1]:44190 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1PgODd-0006zD-C6 for incoming@patchwork.ozlabs.org; Fri, 21 Jan 2011 16:08:29 -0500 Received: from [140.186.70.92] (port=53375 helo=eggs.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1PgNug-0005GR-UB for qemu-devel@nongnu.org; Fri, 21 Jan 2011 15:48:59 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1PgNua-00047W-Iu for qemu-devel@nongnu.org; Fri, 21 Jan 2011 15:48:53 -0500 Received: from fmmailgate01.web.de ([217.72.192.221]:56730) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1PgNua-00046q-7k for qemu-devel@nongnu.org; Fri, 21 Jan 2011 15:48:48 -0500 Received: from smtp02.web.de ( [172.20.0.184]) by fmmailgate01.web.de (Postfix) with ESMTP id 44AAF185533E0; Fri, 21 Jan 2011 21:48:27 +0100 (CET) Received: from [92.75.143.98] (helo=localhost.localdomain) by smtp02.web.de with asmtp (TLSv1:AES256-SHA:256) (WEB.DE 4.110 #2) id 1PgNuF-0007KF-00; Fri, 21 Jan 2011 21:48:27 +0100 From: Jan Kiszka To: Avi Kivity , Marcelo Tosatti Date: Fri, 21 Jan 2011 21:48:08 +0100 Message-Id: <6c2091d95c231bf0deac056d9ece4c517ba28f43.1295642900.git.jan.kiszka@web.de> X-Mailer: git-send-email 1.7.1 In-Reply-To: References: In-Reply-To: References: X-Sender: jan.kiszka@web.de X-Provags-ID: V01U2FsdGVkX195pkJcF2RG10NTfRj/nPQ7mpqKKPDnGg6cfDfu LjhPJLoYFKzRsqZoIuofxo+4/t5YpRwbC+8uncD0+FKpzIWLM3 yc5IYf6Sc= X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.4-2.6 Cc: qemu-devel@nongnu.org, kvm@vger.kernel.org Subject: [Qemu-devel] [PATCH 04/18] x86: Optionally dump code bytes on cpu_dump_state X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: qemu-devel.nongnu.org List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.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 --- 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 10e1194..41decde 100644 --- a/kvm-all.c +++ b/kvm-all.c @@ -832,7 +832,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; } } @@ -994,7 +994,7 @@ int 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 6dfa27d..1217452 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"); + } } /***********************************************************/