From mboxrd@z Thu Jan 1 00:00:00 1970 From: Jan Kiszka Subject: [PATCH] KVM: VMX: Use proper slot index for kvm_set_shared_msr Date: Thu, 29 Oct 2009 17:53:40 +0100 Message-ID: <4AE9C894.2070601@siemens.com> Mime-Version: 1.0 Content-Type: text/plain; charset=ISO-8859-15 Content-Transfer-Encoding: 7bit Cc: kvm To: Avi Kivity , Marcelo Tosatti Return-path: Received: from david.siemens.de ([192.35.17.14]:20637 "EHLO david.siemens.de" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1755785AbZJ2Qxu (ORCPT ); Thu, 29 Oct 2009 12:53:50 -0400 Sender: kvm-owner@vger.kernel.org List-ID: 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 --- IOW: Win7 boots for me again. arch/x86/kvm/vmx.c | 3 ++- 1 files changed, 2 insertions(+), 1 deletions(-) diff --git a/arch/x86/kvm/vmx.c b/arch/x86/kvm/vmx.c index a1976c9..6b818c0 100644 --- a/arch/x86/kvm/vmx.c +++ b/arch/x86/kvm/vmx.c @@ -660,7 +660,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)