[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH v2 05/17] x86: Optionally dump code bytes on cpu_dum
From: |
Jan Kiszka |
Subject: |
[Qemu-devel] [PATCH v2 05/17] x86: Optionally dump code bytes on cpu_dump_state |
Date: |
Mon, 3 Jan 2011 09:32:55 +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 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..1ab42c3 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_phys_addr_t base = env->segs[R_CS].base + env->eip;
+ target_phys_addr_t 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 v2 00/17] [uq/master] Prepare for more qemu-kvm merging, Jan Kiszka, 2011/01/03
- [Qemu-devel] [PATCH v2 08/17] kvm: x86: Remove redundant mp_state initialization, Jan Kiszka, 2011/01/03
- [Qemu-devel] [PATCH v2 09/17] kvm: x86: Fix xcr0 reset mismerge, Jan Kiszka, 2011/01/03
- [Qemu-devel] [PATCH v2 01/17] kvm: Fix coding style violations, Jan Kiszka, 2011/01/03
- [Qemu-devel] [PATCH v2 05/17] x86: Optionally dump code bytes on cpu_dump_state,
Jan Kiszka <=
- [Qemu-devel] [PATCH v2 14/17] kvm: x86: Introduce kvmclock device to save/restore its state, Jan Kiszka, 2011/01/03
- [Qemu-devel] Re: [PATCH v2 14/17] kvm: x86: Introduce kvmclock device to save/restore its state, Glauber Costa, 2011/01/03
- [Qemu-devel] [PATCH v2 07/17] kvm: x86: Prepare kvm_get_mp_state for in-kernel irqchip, Jan Kiszka, 2011/01/03