From: Avi Kivity <a...@redhat.com>
Signed-off-by: Avi Kivity <a...@redhat.com>
diff --git a/target-i386/kvm.c b/target-i386/kvm.c
index 123dcc8..3e71158 100644
--- a/target-i386/kvm.c
+++ b/target-i386/kvm.c
@@ -564,10 +564,7 @@ static int kvm_put_msrs(CPUState *env, int level)
kvm_msr_entry_set(&msrs[n++], MSR_IA32_SYSENTER_EIP, env->sysenter_eip);
if (kvm_has_msr_star(env))
kvm_msr_entry_set(&msrs[n++], MSR_STAR, env->star);
-<<<<<<< HEAD
kvm_msr_entry_set(&msrs[n++], MSR_VM_HSAVE_PA, env->vm_hsave);
-=======
->>>>>>> 6cb2996cef5e273ef370e690e84b5e1403f5c391
#ifdef TARGET_X86_64
/* FIXME if lm capable */
kvm_msr_entry_set(&msrs[n++], MSR_CSTAR, env->cstar);
--
To unsubscribe from this list: send the line "unsubscribe kvm-commits" in
the body of a message to majord...@vger.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
