KVM: VMX: Rename vcpu_vmx's "nmsrs" to "nr_uret_msrs"

Rename vcpu_vmx.nsmrs to vcpu_vmx.nr_uret_msrs to explicitly associate
it with the guest_uret_msrs array.

No functional change intended.

Signed-off-by: Sean Christopherson <sean.j.christopherson@intel.com>
Message-Id: <20200923180409.32255-6-sean.j.christopherson@intel.com>
Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>

diff --git a/arch/x86/kvm/vmx/vmx.c b/arch/x86/kvm/vmx/vmx.c
index 91e9a3657c4bd603c53b4be263d5a091989111c2..07249571f6d5d32ed1f2763f3b22e96ee23aa059 100644 (file)
--- a/arch/x86/kvm/vmx/vmx.c
+++ b/arch/x86/kvm/vmx/vmx.c
@@ -615,7 +615,7 @@ static inline int __find_msr_index(struct vcpu_vmx *vmx, u32 msr)
 {
        int i;
 
-       for (i = 0; i < vmx->nmsrs; ++i)
+       for (i = 0; i < vmx->nr_uret_msrs; ++i)
                if (vmx_msr_index[vmx->guest_uret_msrs[i].index] == msr)
                        return i;
        return -1;
@@ -6726,7 +6726,7 @@ static int vmx_create_vcpu(struct kvm_vcpu *vcpu)
        for (i = 0; i < ARRAY_SIZE(vmx_msr_index); ++i) {
                u32 index = vmx_msr_index[i];
                u32 data_low, data_high;
-               int j = vmx->nmsrs;
+               int j = vmx->nr_uret_msrs;
 
                if (rdmsr_safe(index, &data_low, &data_high) < 0)
                        continue;
@@ -6748,7 +6748,7 @@ static int vmx_create_vcpu(struct kvm_vcpu *vcpu)
                        vmx->guest_uret_msrs[j].mask = -1ull;
                        break;
                }
-               ++vmx->nmsrs;
+               ++vmx->nr_uret_msrs;
        }
 
        err = alloc_loaded_vmcs(&vmx->vmcs01);

diff --git a/arch/x86/kvm/vmx/vmx.h b/arch/x86/kvm/vmx/vmx.h
index a13b61ef92b0e553b554a5128aada3988979168a..82c39ac53165d6a05bab887ee70771847b275370 100644 (file)
--- a/arch/x86/kvm/vmx/vmx.h
+++ b/arch/x86/kvm/vmx/vmx.h
@@ -197,7 +197,7 @@ struct vcpu_vmx {
        ulong                 rflags;
 
        struct vmx_uret_msr   guest_uret_msrs[MAX_NR_USER_RETURN_MSRS];
-       int                   nmsrs;
+       int                   nr_uret_msrs;
        int                   save_nmsrs;
        bool                  guest_msrs_ready;
 #ifdef CONFIG_X86_64