x86/kvm: Convert to new CPU match macros

The new macro set has a consistent namespace and uses C99 initializers
instead of the grufty C89 ones.

Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
Signed-off-by: Borislav Petkov <bp@suse.de>
Reviewed-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Link: https://lkml.kernel.org/r/20200320131509.136884777@linutronix.de

diff --git a/arch/x86/kvm/svm.c b/arch/x86/kvm/svm.c
index 5753fc3bcfc1d23e7a0023c7047975ab285f7bdd..7c959ae20cd4d0aee37106114e5e0751eacd66b1 100644 (file)
--- a/arch/x86/kvm/svm.c
+++ b/arch/x86/kvm/svm.c
@@ -59,7 +59,7 @@ MODULE_AUTHOR("Qumranet");
 MODULE_LICENSE("GPL");
 
 static const struct x86_cpu_id svm_cpu_id[] = {
-       X86_FEATURE_MATCH(X86_FEATURE_SVM),
+       X86_MATCH_FEATURE(X86_FEATURE_SVM, NULL),
        {}
 };
 MODULE_DEVICE_TABLE(x86cpu, svm_cpu_id);

diff --git a/arch/x86/kvm/vmx/vmx.c b/arch/x86/kvm/vmx/vmx.c
index 31c80fa4653d3c98408e3d32931f406558ebeb95..5b017efcc9440a3d6c479a21dc999727cfab5a33 100644 (file)
--- a/arch/x86/kvm/vmx/vmx.c
+++ b/arch/x86/kvm/vmx/vmx.c
@@ -66,7 +66,7 @@ MODULE_AUTHOR("Qumranet");
 MODULE_LICENSE("GPL");
 
 static const struct x86_cpu_id vmx_cpu_id[] = {
-       X86_FEATURE_MATCH(X86_FEATURE_VMX),
+       X86_MATCH_FEATURE(X86_FEATURE_VMX, NULL),
        {}
 };
 MODULE_DEVICE_TABLE(x86cpu, vmx_cpu_id);