Commit eb839917 authored by Xiao Guangrong's avatar Xiao Guangrong Committed by Paolo Bonzini
Browse files

KVM: MTRR: handle MSR_MTRRcap in kvm_mtrr_get_msr 



MSR_MTRRcap is a MTRR msr so move the handler to the common place, also
add some comments to make the hard code more readable

Signed-off-by: default avatarXiao Guangrong <guangrong.xiao@linux.intel.com>
Signed-off-by: default avatarPaolo Bonzini <pbonzini@redhat.com>
parent ff53604b

arch/x86/kvm/mtrr.c

+12 −0
Original line number Diff line number Diff line
@@ -199,6 +199,18 @@ int kvm_mtrr_get_msr(struct kvm_vcpu *vcpu, u32 msr, u64 *pdata) 
{

	u64 *p = (u64 *)&vcpu->arch.mtrr_state.fixed_ranges;



	/* MSR_MTRRcap is a readonly MSR. */

	if (msr == MSR_MTRRcap) {

		/*

		 * SMRR = 0

		 * WC = 1

		 * FIX = 1

		 * VCNT = KVM_NR_VAR_MTRR

		 */

		*pdata = 0x500 | KVM_NR_VAR_MTRR;

		return 0;

	}



	if (!msr_mtrr_valid(msr))

		return 1;

arch/x86/kvm/x86.c

+0 −2
Original line number Diff line number Diff line
@@ -2443,8 +2443,6 @@ int kvm_get_msr_common(struct kvm_vcpu *vcpu, struct msr_data *msr_info) 
		msr_info->data = 0x100000000ULL;

		break;

	case MSR_MTRRcap:

		msr_info->data = 0x500 | KVM_NR_VAR_MTRR;

		break;

	case 0x200 ... 0x2ff:

		return kvm_mtrr_get_msr(vcpu, msr_info->index, &msr_info->data);

	case 0xcd: /* fsb frequency */