From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from [140.186.70.92] (port=59340 helo=eggs.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1PYemg-0006wp-Sw for qemu-devel@nongnu.org; Fri, 31 Dec 2010 08:12:46 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1PYemc-0005HZ-Jw for qemu-devel@nongnu.org; Fri, 31 Dec 2010 08:12:42 -0500 Received: from fmmailgate03.web.de ([217.72.192.234]:48912) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1PYemc-0005Gh-Db for qemu-devel@nongnu.org; Fri, 31 Dec 2010 08:12:38 -0500 Message-ID: <4D1DD6B8.7000707@web.de> Date: Fri, 31 Dec 2010 14:12:24 +0100 From: Jan Kiszka MIME-Version: 1.0 Content-Type: text/plain; charset=ISO-8859-15 Content-Transfer-Encoding: 7bit Sender: jan.kiszka@web.de Subject: [Qemu-devel] [PATCH] kvm: x86: Fix xcr0 reset mismerge List-Id: qemu-devel.nongnu.org List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: Avi Kivity , Marcelo Tosatti Cc: qemu-devel , kvm , Sheng Yang From: Jan Kiszka For unknown reset, xcr0 reset ended up in kvm_arch_update_guest_debug on upstream merge. Fix this and also remove the misleading comment (1 is THE reset value). Signed-off-by: Jan Kiszka --- target-i386/kvm.c | 3 +-- 1 files changed, 1 insertions(+), 2 deletions(-) diff --git a/target-i386/kvm.c b/target-i386/kvm.c index dcac3d8..3008229 100644 --- a/target-i386/kvm.c +++ b/target-i386/kvm.c @@ -516,6 +516,7 @@ void kvm_arch_reset_vcpu(CPUState *env) env->interrupt_injected = -1; env->nmi_injected = 0; env->nmi_pending = 0; + env->xcr0 = 1; env->system_time_msr = 0; env->wall_clock_msr = 0; env->async_pf_en_msr = 0; @@ -1821,8 +1822,6 @@ void kvm_arch_update_guest_debug(CPUState *env, struct kvm_guest_debug *dbg) ((uint32_t)len_code[hw_breakpoint[n].len] << (18 + n*4)); } } - /* Legal xcr0 for loading */ - env->xcr0 = 1; } #endif /* KVM_CAP_SET_GUEST_DEBUG */