Patchwork kvm: x86: Fix xcr0 reset mismerge

login
register
mail settings
Submitter Jan Kiszka
Date Dec. 31, 2010, 1:12 p.m.
Message ID <4D1DD6B8.7000707@web.de>
Download mbox | patch
Permalink /patch/77078/
State New
Headers show

Comments

Jan Kiszka - Dec. 31, 2010, 1:12 p.m.
From: Jan Kiszka <jan.kiszka@siemens.com>

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 <jan.kiszka@siemens.com>
---
 target-i386/kvm.c |    3 +--
 1 files changed, 1 insertions(+), 2 deletions(-)

Patch

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 */