From de7faae38c67faf90d078152e10ab8ce0514bb5e Mon Sep 17 00:00:00 2001 From: Avi Kivity Date: Thu, 11 Mar 2010 11:45:27 +0200 Subject: [PATCH] Remove merge conflict markers left in target-i386/kvm.c. Signed-off-by: Avi Kivity --- target-i386/kvm.c | 3 --- 1 file changed, 3 deletions(-) diff --git a/target-i386/kvm.c b/target-i386/kvm.c index 123dcc8df3..3e71158b7c 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); -- 2.11.4.GIT