Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit b0996ae4 authored by Nicolas Iooss's avatar Nicolas Iooss Committed by Paolo Bonzini
Browse files

KVM: x86: remove data variable from kvm_get_msr_common 



Commit 609e36d3 ("KVM: x86: pass host_initiated to functions that
read MSRs") modified kvm_get_msr_common function to use msr_info->data
instead of data but missed one occurrence.  Replace it and remove the
unused local variable.

Fixes: 609e36d3 ("KVM: x86: pass host_initiated to functions that
read MSRs")
Signed-off-by: default avatarNicolas Iooss <nicolas.iooss_linux@m4x.org>
Signed-off-by: default avatarPaolo Bonzini <pbonzini@redhat.com>
parent 431dae77

arch/x86/kvm/x86.c

+1 −3
Original line number Diff line number Diff line
@@ -2379,8 +2379,6 @@ static int get_msr_hyperv(struct kvm_vcpu *vcpu, u32 msr, u64 *pdata) 


int kvm_get_msr_common(struct kvm_vcpu *vcpu, struct msr_data *msr_info)

{

	u64 data;



	switch (msr_info->index) {

	case MSR_IA32_PLATFORM_ID:

	case MSR_IA32_EBL_CR_POWERON:
@@ -2453,7 +2451,7 @@ int kvm_get_msr_common(struct kvm_vcpu *vcpu, struct msr_data *msr_info) 
		/* TSC increment by tick */

		msr_info->data = 1000ULL;

		/* CPU multiplier */

		data |= (((uint64_t)4ULL) << 40);

		msr_info->data |= (((uint64_t)4ULL) << 40);

		break;

	case MSR_EFER:

		msr_info->data = vcpu->arch.efer;