KVM: X86: Introduce kvm_get_msr_feature()

commit 66421c1ec340096b291af763ed5721314cdd9c5c upstream

Introduce kvm_get_msr_feature() to handle the msrs which are supported
by different vendors and sharing the same emulation logic.

Signed-off-by: Wanpeng Li <wanpengli@tencent.com>
Signed-off-by: Radim Krčmář <rkrcmar@redhat.com>
Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
Reviewed-by: Paolo Bonzini <pbonzini@redhat.com>
Cc: Liran Alon <liran.alon@oracle.com>
Cc: Nadav Amit <nadav.amit@gmail.com>
Cc: Borislav Petkov <bp@alien8.de>
Cc: Tom Lendacky <thomas.lendacky@amd.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

diff --git a/arch/x86/kvm/x86.c b/arch/x86/kvm/x86.c
index 9c1a9568c78db3f9062c7a063bb802066a75ff47..0c7e44891dc8d37db2fa709779aceb3a5285ca26 100644 (file)
--- a/arch/x86/kvm/x86.c
+++ b/arch/x86/kvm/x86.c
@@ -1052,13 +1052,25 @@ static u32 msr_based_features[] = {
 
 static unsigned int num_msr_based_features;
 
+static int kvm_get_msr_feature(struct kvm_msr_entry *msr)
+{
+       switch (msr->index) {
+       default:
+               if (kvm_x86_ops->get_msr_feature(msr))
+                       return 1;
+       }
+       return 0;
+}
+
 static int do_get_msr_feature(struct kvm_vcpu *vcpu, unsigned index, u64 *data)
 {
        struct kvm_msr_entry msr;
+       int r;
 
        msr.index = index;
-       if (kvm_x86_ops->get_msr_feature(&msr))
-               return 1;
+       r = kvm_get_msr_feature(&msr);
+       if (r)
+               return r;
 
        *data = msr.data;
 
@@ -4392,7 +4404,7 @@ static void kvm_init_msr_list(void)
                struct kvm_msr_entry msr;
 
                msr.index = msr_based_features[i];
-               if (kvm_x86_ops->get_msr_feature(&msr))
+               if (kvm_get_msr_feature(&msr))
                        continue;
 
                if (j < i)