Commit f9925721 authored by Alejandro Jimenez's avatar Alejandro Jimenez Committed by Sean Christopherson

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: default avatarSean Christopherson <seanjc@google.com>
Signed-off-by: default avatarAlejandro Jimenez <alejandro.j.jimenez@oracle.com>
Link: https://lore.kernel.org/r/20240506225321.3440701-3-alejandro.j.jimenez@oracle.comSigned-off-by: default avatarSean Christopherson <seanjc@google.com>
parent 69148cce
...@@ -1207,7 +1207,7 @@ enum kvm_apicv_inhibit { ...@@ -1207,7 +1207,7 @@ enum kvm_apicv_inhibit {
* APIC acceleration is disabled by a module parameter * APIC acceleration is disabled by a module parameter
* and/or not supported in hardware. * and/or not supported in hardware.
*/ */
APICV_INHIBIT_REASON_DISABLE, APICV_INHIBIT_REASON_DISABLED,
/* /*
* APIC acceleration is inhibited because AutoEOI feature is * APIC acceleration is inhibited because AutoEOI feature is
...@@ -1285,7 +1285,7 @@ enum kvm_apicv_inhibit { ...@@ -1285,7 +1285,7 @@ enum kvm_apicv_inhibit {
{ BIT(APICV_INHIBIT_REASON_##reason), #reason } { BIT(APICV_INHIBIT_REASON_##reason), #reason }
#define APICV_INHIBIT_REASONS \ #define APICV_INHIBIT_REASONS \
__APICV_INHIBIT_REASON(DISABLE), \ __APICV_INHIBIT_REASON(DISABLED), \
__APICV_INHIBIT_REASON(HYPERV), \ __APICV_INHIBIT_REASON(HYPERV), \
__APICV_INHIBIT_REASON(ABSENT), \ __APICV_INHIBIT_REASON(ABSENT), \
__APICV_INHIBIT_REASON(BLOCKIRQ), \ __APICV_INHIBIT_REASON(BLOCKIRQ), \
......
...@@ -636,7 +636,7 @@ extern struct kvm_x86_nested_ops svm_nested_ops; ...@@ -636,7 +636,7 @@ extern struct kvm_x86_nested_ops svm_nested_ops;
/* avic.c */ /* avic.c */
#define AVIC_REQUIRED_APICV_INHIBITS \ #define AVIC_REQUIRED_APICV_INHIBITS \
( \ ( \
BIT(APICV_INHIBIT_REASON_DISABLE) | \ BIT(APICV_INHIBIT_REASON_DISABLED) | \
BIT(APICV_INHIBIT_REASON_ABSENT) | \ BIT(APICV_INHIBIT_REASON_ABSENT) | \
BIT(APICV_INHIBIT_REASON_HYPERV) | \ BIT(APICV_INHIBIT_REASON_HYPERV) | \
BIT(APICV_INHIBIT_REASON_NESTED) | \ BIT(APICV_INHIBIT_REASON_NESTED) | \
......
...@@ -8,7 +8,7 @@ ...@@ -8,7 +8,7 @@
#include "posted_intr.h" #include "posted_intr.h"
#define VMX_REQUIRED_APICV_INHIBITS \ #define VMX_REQUIRED_APICV_INHIBITS \
(BIT(APICV_INHIBIT_REASON_DISABLE)| \ (BIT(APICV_INHIBIT_REASON_DISABLED) | \
BIT(APICV_INHIBIT_REASON_ABSENT) | \ BIT(APICV_INHIBIT_REASON_ABSENT) | \
BIT(APICV_INHIBIT_REASON_HYPERV) | \ BIT(APICV_INHIBIT_REASON_HYPERV) | \
BIT(APICV_INHIBIT_REASON_BLOCKIRQ) | \ BIT(APICV_INHIBIT_REASON_BLOCKIRQ) | \
......
...@@ -10052,7 +10052,7 @@ static void set_or_clear_apicv_inhibit(unsigned long *inhibits, ...@@ -10052,7 +10052,7 @@ static void set_or_clear_apicv_inhibit(unsigned long *inhibits,
static void kvm_apicv_init(struct kvm *kvm) static void kvm_apicv_init(struct kvm *kvm)
{ {
enum kvm_apicv_inhibit reason = enable_apicv ? APICV_INHIBIT_REASON_ABSENT : 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); set_or_clear_apicv_inhibit(&kvm->arch.apicv_inhibit_reasons, reason, true);
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment