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

Commit 81760dcc authored by Chen Yucong's avatar Chen Yucong Committed by Paolo Bonzini
Browse files

kvm: x86: use macros to compute bank MSRs 



Avoid open coded calculations for bank MSRs by using well-defined
macros that hide the index of higher bank MSRs.

No semantic changes.

Signed-off-by: default avatarChen Yucong <slaoub@gmail.com>
Signed-off-by: default avatarPaolo Bonzini <pbonzini@redhat.com>
parent d5262739

arch/x86/kvm/x86.c

+4 −4
Original line number Diff line number Diff line
@@ -1826,7 +1826,7 @@ static int set_msr_mce(struct kvm_vcpu *vcpu, u32 msr, u64 data) 
		break;

	default:

		if (msr >= MSR_IA32_MC0_CTL &&

		    msr < MSR_IA32_MC0_CTL + 4 * bank_num) {

		    msr < MSR_IA32_MCx_CTL(bank_num)) {

			u32 offset = msr - MSR_IA32_MC0_CTL;

			/* only 0 or all 1s can be written to IA32_MCi_CTL

			 * some Linux kernels though clear bit 10 in bank 4 to
@@ -2185,7 +2185,7 @@ int kvm_set_msr_common(struct kvm_vcpu *vcpu, struct msr_data *msr_info) 


	case MSR_IA32_MCG_CTL:

	case MSR_IA32_MCG_STATUS:

	case MSR_IA32_MC0_CTL ... MSR_IA32_MC0_CTL + 4 * KVM_MAX_MCE_BANKS - 1:

	case MSR_IA32_MC0_CTL ... MSR_IA32_MCx_CTL(KVM_MAX_MCE_BANKS) - 1:

		return set_msr_mce(vcpu, msr, data);



	/* Performance counters are not protected by a CPUID bit,
@@ -2351,7 +2351,7 @@ static int get_msr_mce(struct kvm_vcpu *vcpu, u32 msr, u64 *pdata) 
		break;

	default:

		if (msr >= MSR_IA32_MC0_CTL &&

		    msr < MSR_IA32_MC0_CTL + 4 * bank_num) {

		    msr < MSR_IA32_MCx_CTL(bank_num)) {

			u32 offset = msr - MSR_IA32_MC0_CTL;

			data = vcpu->arch.mce_banks[offset];

			break;
@@ -2532,7 +2532,7 @@ int kvm_get_msr_common(struct kvm_vcpu *vcpu, u32 msr, u64 *pdata) 
	case MSR_IA32_MCG_CAP:

	case MSR_IA32_MCG_CTL:

	case MSR_IA32_MCG_STATUS:

	case MSR_IA32_MC0_CTL ... MSR_IA32_MC0_CTL + 4 * KVM_MAX_MCE_BANKS - 1:

	case MSR_IA32_MC0_CTL ... MSR_IA32_MCx_CTL(KVM_MAX_MCE_BANKS) - 1:

		return get_msr_mce(vcpu, msr, pdata);

	case MSR_K7_CLK_CTL:

		/*