From: Jan Kiszka <jan.kiszka@xxxxxxxxxxx> Obviously a merge artifact. Signed-off-by: Jan Kiszka <jan.kiszka@xxxxxxxxxxx> Signed-off-by: Marcelo Tosatti <mtosatti@xxxxxxxxxx> diff --git a/target-i386/kvm.c b/target-i386/kvm.c index 940600c..272594d 100644 --- a/target-i386/kvm.c +++ b/target-i386/kvm.c @@ -1089,7 +1089,6 @@ static int kvm_get_msrs(CPUState *env) if (kvm_has_msr_hsave_pa(env)) msrs[n++].index = MSR_VM_HSAVE_PA; msrs[n++].index = MSR_IA32_TSC; - msrs[n++].index = MSR_VM_HSAVE_PA; #ifdef TARGET_X86_64 if (lm_capable_kernel) { msrs[n++].index = MSR_CSTAR; -- To unsubscribe from this list: send the line "unsubscribe kvm-commits" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html