From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43) id 1MoLMu-0004hn-81 for qemu-devel@nongnu.org; Thu, 17 Sep 2009 14:06:08 -0400 Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43) id 1MoLMp-0004hI-9m for qemu-devel@nongnu.org; Thu, 17 Sep 2009 14:06:07 -0400 Received: from [199.232.76.173] (port=53061 helo=monty-python.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1MoLMp-0004hF-7D for qemu-devel@nongnu.org; Thu, 17 Sep 2009 14:06:03 -0400 Received: from goliath.siemens.de ([192.35.17.28]:17345) by monty-python.gnu.org with esmtps (TLS-1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.60) (envelope-from ) id 1MoLMo-0001DG-HO for qemu-devel@nongnu.org; Thu, 17 Sep 2009 14:06:02 -0400 Message-ID: <4AB27A86.3020007@siemens.com> Date: Thu, 17 Sep 2009 20:05:58 +0200 From: Jan Kiszka MIME-Version: 1.0 Content-Type: text/plain; charset=ISO-8859-15 Content-Transfer-Encoding: 7bit Subject: [Qemu-devel] [PATCH] kvm: Fix guest single-stepping List-Id: qemu-devel.nongnu.org List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: Anthony Liguori Cc: Avi Kivity , qemu-devel Hopefully the last regression of 4c0960c0: KVM_SET_GUEST_DEBUG requires properly synchronized guest registers (on x86: eflags) on entry. Signed-off-by: Jan Kiszka --- kvm-all.c | 8 +++++++- 1 files changed, 7 insertions(+), 1 deletions(-) diff --git a/kvm-all.c b/kvm-all.c index 3c37dd7..6142e3f 100644 --- a/kvm-all.c +++ b/kvm-all.c @@ -942,7 +942,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)