[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH 04/18] x86: Optionally dump code bytes on cpu_dump_s
From: |
Jan Kiszka |
Subject: |
[Qemu-devel] [PATCH 04/18] x86: Optionally dump code bytes on cpu_dump_state |
Date: |
Fri, 21 Jan 2011 21:48:08 +0100 |
From: Jan Kiszka <address@hidden>
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 <address@hidden>
---
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");
+ }
}
/***********************************************************/
--
1.7.1
- [Qemu-devel] [PATCH 16/18] kvm: Do not use qemu_fair_mutex, (continued)
- [Qemu-devel] [PATCH 16/18] kvm: Do not use qemu_fair_mutex, Jan Kiszka, 2011/01/21
- [Qemu-devel] [PATCH 18/18] kvm: x86: Only read/write MSR_KVM_ASYNC_PF_EN if supported, Jan Kiszka, 2011/01/21
- [Qemu-devel] [PATCH 17/18] kvm: x86: Implicitly clear nmi_injected/pending on reset, Jan Kiszka, 2011/01/21
- [Qemu-devel] [PATCH 13/18] kvm: Consolidate must-have capability checks, Jan Kiszka, 2011/01/21
- [Qemu-devel] [PATCH 06/18] kvm: x86: Prepare kvm_get_mp_state for in-kernel irqchip, Jan Kiszka, 2011/01/21
- [Qemu-devel] [PATCH 05/18] kvm: x86: Align kvm_arch_put_registers code with comment, Jan Kiszka, 2011/01/21
- [Qemu-devel] [PATCH 03/18] kvm: Improve reporting of fatal errors, Jan Kiszka, 2011/01/21
- [Qemu-devel] [PATCH 10/18] kvm: x86: Reset paravirtual MSRs, Jan Kiszka, 2011/01/21
- [Qemu-devel] [PATCH 01/18] kvm: x86: Swallow KVM_EXIT_SET_TPR, Jan Kiszka, 2011/01/21
- [Qemu-devel] [PATCH 07/18] kvm: x86: Remove redundant mp_state initialization, Jan Kiszka, 2011/01/21
- [Qemu-devel] [PATCH 04/18] x86: Optionally dump code bytes on cpu_dump_state,
Jan Kiszka <=
- [Qemu-devel] [PATCH 11/18] kvm: x86: Fix !CONFIG_KVM_PARA build, Jan Kiszka, 2011/01/21
- [Qemu-devel] [PATCH 02/18] kvm: Stop on all fatal exit reasons, Jan Kiszka, 2011/01/21
- [Qemu-devel] [PATCH 12/18] kvm: Drop smp_cpus argument from init functions, Jan Kiszka, 2011/01/21
- [Qemu-devel] [PATCH 14/18] kvm: x86: Rework identity map and TSS setup for larger BIOS sizes, Jan Kiszka, 2011/01/21
- [Qemu-devel] [PATCH 08/18] kvm: x86: Fix xcr0 reset mismerge, Jan Kiszka, 2011/01/21
- [Qemu-devel] [PATCH 09/18] kvm: x86: Refactor msr_star/hsave_pa setup and checks, Jan Kiszka, 2011/01/21