]> www.infradead.org Git - users/dwmw2/linux.git/commitdiff
KVM: VMX: Use proper slot index for kvm_set_shared_msr
authorJan Kiszka <jan.kiszka@siemens.com>
Thu, 29 Oct 2009 16:53:40 +0000 (17:53 +0100)
committerAvi Kivity <avi@redhat.com>
Sun, 1 Nov 2009 09:09:39 +0000 (11:09 +0200)
We were missing one indirection here to translate from vmx-local to
x86 slot indices, and this caused subtle host crashes.

Signed-off-by: Jan Kiszka <jan.kiszka@siemens.com>
Signed-off-by: Avi Kivity <avi@redhat.com>
arch/x86/kvm/vmx.c

index baa46c7deaa767afe22d4fd813c8898912fdc1aa..b923f2a287bde9aef4467dbd69b1be9603c335c2 100644 (file)
@@ -656,7 +656,8 @@ static void vmx_save_host_state(struct kvm_vcpu *vcpu)
        }
 #endif
        for (i = 0; i < vmx->save_nmsrs; ++i)
-               kvm_set_shared_msr(i, vmx->guest_msrs[i].data);
+               kvm_set_shared_msr(vmx->guest_msrs[i].index,
+                                  vmx->guest_msrs[i].data);
 }
 
 static void __vmx_load_host_state(struct vcpu_vmx *vmx)