kvm: vmx: Rename function find_msr() to vmx_find_msr_index()

Rename function find_msr() to vmx_find_msr_index() in preparation for an
upcoming patch where we export it and use it in nested.c.

Reviewed-by: Jim Mattson <jmattson@google.com>
Signed-off-by: Aaron Lewis <aaronlewis@google.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 ba0124e66db72075397325ccf7b57df6f4eb5598..7b191963dde14cadb04bd59da28d925176bb9d96 100644 (file)
--- a/arch/x86/kvm/vmx/vmx.c
+++ b/arch/x86/kvm/vmx/vmx.c
@@ -833,7 +833,7 @@ static void clear_atomic_switch_msr_special(struct vcpu_vmx *vmx,
        vm_exit_controls_clearbit(vmx, exit);
 }
 
-static int find_msr(struct vmx_msrs *m, unsigned int msr)
+static int vmx_find_msr_index(struct vmx_msrs *m, u32 msr)
 {
        unsigned int i;
 
@@ -867,7 +867,7 @@ static void clear_atomic_switch_msr(struct vcpu_vmx *vmx, unsigned msr)
                }
                break;
        }
-       i = find_msr(&m->guest, msr);
+       i = vmx_find_msr_index(&m->guest, msr);
        if (i < 0)
                goto skip_guest;
        --m->guest.nr;
@@ -875,7 +875,7 @@ static void clear_atomic_switch_msr(struct vcpu_vmx *vmx, unsigned msr)
        vmcs_write32(VM_ENTRY_MSR_LOAD_COUNT, m->guest.nr);
 
 skip_guest:
-       i = find_msr(&m->host, msr);
+       i = vmx_find_msr_index(&m->host, msr);
        if (i < 0)
                return;
 
@@ -934,9 +934,9 @@ static void add_atomic_switch_msr(struct vcpu_vmx *vmx, unsigned msr,
                wrmsrl(MSR_IA32_PEBS_ENABLE, 0);
        }
 
-       i = find_msr(&m->guest, msr);
+       i = vmx_find_msr_index(&m->guest, msr);
        if (!entry_only)
-               j = find_msr(&m->host, msr);
+               j = vmx_find_msr_index(&m->host, msr);
 
        if ((i < 0 && m->guest.nr == NR_LOADSTORE_MSRS) ||
                (j < 0 &&  m->host.nr == NR_LOADSTORE_MSRS)) {