From mboxrd@z Thu Jan 1 00:00:00 1970 From: Jan Kiszka Subject: [PATCH] kvm: x86: Fix xcr0 reset mismerge Date: Fri, 31 Dec 2010 14:12:24 +0100 Message-ID: <4D1DD6B8.7000707@web.de> Mime-Version: 1.0 Content-Type: text/plain; charset=ISO-8859-15 Content-Transfer-Encoding: 7bit Cc: kvm , qemu-devel , Sheng Yang To: Avi Kivity , Marcelo Tosatti Return-path: Received: from fmmailgate03.web.de ([217.72.192.234]:48894 "EHLO fmmailgate03.web.de" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753435Ab0LaNMi (ORCPT ); Fri, 31 Dec 2010 08:12:38 -0500 Sender: kvm-owner@vger.kernel.org List-ID: 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 */