kvm: Fix guest single-stepping

[mirror_qemu.git] / kvm-all.c

diff --git a/kvm-all.c b/kvm-all.c
index 7dcc55319c8329793aef7e632914ee8b988a18f0..f50c31c64319c34911887911cbe7951e32b1400a 100644 (file)
--- a/kvm-all.c
+++ b/kvm-all.c
@@ -938,7 +938,13 @@ struct kvm_set_guest_debug_data {
 static void kvm_invoke_set_guest_debug(void *data)
 {
     struct kvm_set_guest_debug_data *dbg_data = data;
-    dbg_data->err = kvm_vcpu_ioctl(dbg_data->env, KVM_SET_GUEST_DEBUG, &dbg_data->dbg);
+    CPUState *env = dbg_data->env;
+
+    if (env->kvm_state->regs_modified) {
+        kvm_arch_put_registers(env);
+        env->kvm_state->regs_modified = 0;
+    }
+    dbg_data->err = kvm_vcpu_ioctl(env, KVM_SET_GUEST_DEBUG, &dbg_data->dbg);
 }
 
 int kvm_update_guest_debug(CPUState *env, unsigned long reinject_trap)