From patchwork Thu Oct 29 16:53:40 2009
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: 7bit
X-Patchwork-Submitter: Jan Kiszka <jan.kiszka@siemens.com>
X-Patchwork-Id: 56494
Received: from vger.kernel.org (vger.kernel.org [209.132.176.167])
	by demeter.kernel.org (8.14.2/8.14.2) with ESMTP id n9TGrwxd030417
	for <patchwork-kvm@patchwork.kernel.org>;
	Thu, 29 Oct 2009 16:53:58 GMT
Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand
	id S1755818AbZJ2Qxv (ORCPT
	<rfc822;patchwork-kvm@patchwork.kernel.org>);
	Thu, 29 Oct 2009 12:53:51 -0400
Received: (majordomo@vger.kernel.org) by vger.kernel.org id S1755834AbZJ2Qxv
	(ORCPT <rfc822;kvm-outgoing>); Thu, 29 Oct 2009 12:53:51 -0400
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 <rfc822;kvm@vger.kernel.org>);
	Thu, 29 Oct 2009 12:53:50 -0400
Received: from mail1.siemens.de (localhost [127.0.0.1])
	by david.siemens.de (8.12.11.20060308/8.12.11) with ESMTP id
	n9TGrfZc020595; Thu, 29 Oct 2009 17:53:41 +0100
Received: from [139.25.109.167] (mchn012c.mchp.siemens.de [139.25.109.167]
	(may be forged))
	by mail1.siemens.de (8.12.11.20060308/8.12.11) with ESMTP id
	n9TGrfXh029611; Thu, 29 Oct 2009 17:53:41 +0100
Message-ID: <4AE9C894.2070601@siemens.com>
Date: Thu, 29 Oct 2009 17:53:40 +0100
From: Jan Kiszka <jan.kiszka@siemens.com>
User-Agent: Mozilla/5.0 (X11; U; Linux i686 (x86_64); de;
	rv:1.8.1.12) Gecko/20080226 SUSE/2.0.0.12-1.1
	Thunderbird/2.0.0.12 Mnenhy/0.7.5.666
MIME-Version: 1.0
To: Avi Kivity <avi@redhat.com>, Marcelo Tosatti <mtosatti@redhat.com>
CC: kvm <kvm@vger.kernel.org>
Subject: [PATCH] KVM: VMX: Use proper slot index for kvm_set_shared_msr
Sender: kvm-owner@vger.kernel.org
Precedence: bulk
List-ID: <kvm.vger.kernel.org>
X-Mailing-List: kvm@vger.kernel.org


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)