Prepare to apply the QEMU debugging series by removing the old guest
debugging hooks for KVM.
Signed-off-by: Jan Kiszka <[EMAIL PROTECTED]>
---
qemu/exec.c | 8 --------
qemu/qemu-kvm.c | 7 +------
2 files changed, 1 insertion(+), 14 deletions(-)
Index: b/qemu/exec.c
===================================================================
--- a/qemu/exec.c
+++ b/qemu/exec.c
@@ -1390,9 +1390,6 @@ int cpu_breakpoint_insert(CPUState *env,
return -1;
env->breakpoints[env->nb_breakpoints++] = pc;
- if (kvm_enabled())
- kvm_update_debugger(env);
-
breakpoint_invalidate(env, pc);
return 0;
#else
@@ -1426,9 +1423,6 @@ int cpu_breakpoint_remove(CPUState *env,
if (i < env->nb_breakpoints)
env->breakpoints[i] = env->breakpoints[env->nb_breakpoints];
- if (kvm_enabled())
- kvm_update_debugger(env);
-
breakpoint_invalidate(env, pc);
return 0;
#else
@@ -1447,8 +1441,6 @@ void cpu_single_step(CPUState *env, int
/* XXX: only flush what is necessary */
tb_flush(env);
}
- if (kvm_enabled())
- kvm_update_debugger(env);
#endif
}
Index: b/qemu/qemu-kvm.c
===================================================================
--- a/qemu/qemu-kvm.c
+++ b/qemu/qemu-kvm.c
@@ -851,17 +851,12 @@ void kvm_invoke_guest_debug(void *data)
int kvm_update_debugger(CPUState *env)
{
struct kvm_guest_debug_data data;
- int i;
memset(data.dbg.breakpoints, 0, sizeof(data.dbg.breakpoints));
data.dbg.enabled = 0;
- if (env->nb_breakpoints || env->singlestep_enabled) {
+ if (env->singlestep_enabled) {
data.dbg.enabled = 1;
- for (i = 0; i < 4 && i < env->nb_breakpoints; ++i) {
- data.dbg.breakpoints[i].enabled = 1;
- data.dbg.breakpoints[i].address = env->breakpoints[i];
- }
data.dbg.singlestep = env->singlestep_enabled;
}
on_vcpu(env, kvm_invoke_guest_debug, &data);
--
To unsubscribe from this list: send the line "unsubscribe kvm" in
the body of a message to [EMAIL PROTECTED]
More majordomo info at http://vger.kernel.org/majordomo-info.html
