KVM: x86: Keep consistent naming for APICv/AVIC inhibit reasons

Keep kvm_apicv_inhibit enum naming consistent with the current pattern by
renaming the reason/enumerator defined as APICV_INHIBIT_REASON_DISABLE to
APICV_INHIBIT_REASON_DISABLED.

No functional change intended.

Suggested-by: Sean Christopherson <seanjc@google.com>
Signed-off-by: Alejandro Jimenez <alejandro.j.jimenez@oracle.com>
Link: https://lore.kernel.org/r/20240506225321.3440701-3-alejandro.j.jimenez@oracle.com
Signed-off-by: Sean Christopherson <seanjc@google.com>

diff --git a/arch/x86/include/asm/kvm_host.h b/arch/x86/include/asm/kvm_host.h
index 8323a7f619b0f8d03278bc8f855492902bbe64bb..6d040b015dc3bd6719b98c93179f105c6a16d902 100644 (file)
--- a/arch/x86/include/asm/kvm_host.h
+++ b/arch/x86/include/asm/kvm_host.h
@@ -1207,7 +1207,7 @@ enum kvm_apicv_inhibit {
         * APIC acceleration is disabled by a module parameter
         * and/or not supported in hardware.
         */
-       APICV_INHIBIT_REASON_DISABLE,
+       APICV_INHIBIT_REASON_DISABLED,
 
        /*
         * APIC acceleration is inhibited because AutoEOI feature is
@@ -1285,7 +1285,7 @@ enum kvm_apicv_inhibit {
        { BIT(APICV_INHIBIT_REASON_##reason), #reason }
 
 #define APICV_INHIBIT_REASONS                          \
-       __APICV_INHIBIT_REASON(DISABLE),                \
+       __APICV_INHIBIT_REASON(DISABLED),               \
        __APICV_INHIBIT_REASON(HYPERV),                 \
        __APICV_INHIBIT_REASON(ABSENT),                 \
        __APICV_INHIBIT_REASON(BLOCKIRQ),               \

diff --git a/arch/x86/kvm/svm/svm.h b/arch/x86/kvm/svm/svm.h
index be57213cd295935f055bf46d3856393944108061..90dca363aae11a8ade979d61bebb4f49399317b9 100644 (file)
--- a/arch/x86/kvm/svm/svm.h
+++ b/arch/x86/kvm/svm/svm.h
@@ -636,7 +636,7 @@ extern struct kvm_x86_nested_ops svm_nested_ops;
 /* avic.c */
 #define AVIC_REQUIRED_APICV_INHIBITS                   \
 (                                                      \
-       BIT(APICV_INHIBIT_REASON_DISABLE) |             \
+       BIT(APICV_INHIBIT_REASON_DISABLED) |            \
        BIT(APICV_INHIBIT_REASON_ABSENT) |              \
        BIT(APICV_INHIBIT_REASON_HYPERV) |              \
        BIT(APICV_INHIBIT_REASON_NESTED) |              \

diff --git a/arch/x86/kvm/vmx/main.c b/arch/x86/kvm/vmx/main.c
index d4ed681785fd649d0dcbcfa4a2c1064546a4dca1..d0e1a5b5c9154fc2f0a49e8d80320799a925bb1e 100644 (file)
--- a/arch/x86/kvm/vmx/main.c
+++ b/arch/x86/kvm/vmx/main.c
@@ -8,7 +8,7 @@
 #include "posted_intr.h"
 
 #define VMX_REQUIRED_APICV_INHIBITS                            \
-       (BIT(APICV_INHIBIT_REASON_DISABLE)|                     \
+       (BIT(APICV_INHIBIT_REASON_DISABLED) |                   \
         BIT(APICV_INHIBIT_REASON_ABSENT) |                     \
         BIT(APICV_INHIBIT_REASON_HYPERV) |                     \
         BIT(APICV_INHIBIT_REASON_BLOCKIRQ) |                   \

diff --git a/arch/x86/kvm/x86.c b/arch/x86/kvm/x86.c
index e5a61270b3ae3f629691054d918d6a9542c2ca9a..e60c13da89946b72f32f9cfa7ae2371c2f2cf06b 100644 (file)
--- a/arch/x86/kvm/x86.c
+++ b/arch/x86/kvm/x86.c
@@ -10052,7 +10052,7 @@ static void set_or_clear_apicv_inhibit(unsigned long *inhibits,
 static void kvm_apicv_init(struct kvm *kvm)
 {
        enum kvm_apicv_inhibit reason = enable_apicv ? APICV_INHIBIT_REASON_ABSENT :
-                                                      APICV_INHIBIT_REASON_DISABLE;
+                                                      APICV_INHIBIT_REASON_DISABLED;
 
        set_or_clear_apicv_inhibit(&kvm->arch.apicv_inhibit_reasons, reason, true);