KVM: arm64: Use kvm_vcpu_has_feature() directly for struct kvm

Now that we have introduced kvm_vcpu_has_feature(), use it in the
remaining code that checks for features in struct kvm, instead of
using the __vcpu_has_feature() helper.

No functional change intended.

Suggested-by: Quentin Perret <qperret@google.com>
Signed-off-by: Fuad Tabba <tabba@google.com>
Link: https://lore.kernel.org/r/20241216105057.579031-18-tabba@google.com
Signed-off-by: Marc Zyngier <maz@kernel.org>

diff --git a/arch/arm64/kvm/nested.c b/arch/arm64/kvm/nested.c
index 9b36218b48def495708f49b59e5f9211bd86cc0f..4cada42788f78b76dbd5126fbd77a5b9994f6edc 100644 (file)
--- a/arch/arm64/kvm/nested.c
+++ b/arch/arm64/kvm/nested.c
@@ -1021,8 +1021,8 @@ int kvm_init_nv_sysregs(struct kvm *kvm)
                res0 |= HCR_NV2;
        if (!kvm_has_feat(kvm, ID_AA64MMFR2_EL1, NV, IMP))
                res0 |= (HCR_AT | HCR_NV1 | HCR_NV);
-       if (!(__vcpu_has_feature(&kvm->arch, KVM_ARM_VCPU_PTRAUTH_ADDRESS) &&
-             __vcpu_has_feature(&kvm->arch, KVM_ARM_VCPU_PTRAUTH_GENERIC)))
+       if (!(kvm_vcpu_has_feature(kvm, KVM_ARM_VCPU_PTRAUTH_ADDRESS) &&
+             kvm_vcpu_has_feature(kvm, KVM_ARM_VCPU_PTRAUTH_GENERIC)))
                res0 |= (HCR_API | HCR_APK);
        if (!kvm_has_feat(kvm, ID_AA64ISAR0_EL1, TME, IMP))
                res0 |= BIT(39);
@@ -1078,8 +1078,8 @@ int kvm_init_nv_sysregs(struct kvm *kvm)
 
        /* HFG[RW]TR_EL2 */
        res0 = res1 = 0;
-       if (!(__vcpu_has_feature(&kvm->arch, KVM_ARM_VCPU_PTRAUTH_ADDRESS) &&
-             __vcpu_has_feature(&kvm->arch, KVM_ARM_VCPU_PTRAUTH_GENERIC)))
+       if (!(kvm_vcpu_has_feature(kvm, KVM_ARM_VCPU_PTRAUTH_ADDRESS) &&
+             kvm_vcpu_has_feature(kvm, KVM_ARM_VCPU_PTRAUTH_GENERIC)))
                res0 |= (HFGxTR_EL2_APDAKey | HFGxTR_EL2_APDBKey |
                         HFGxTR_EL2_APGAKey | HFGxTR_EL2_APIAKey |
                         HFGxTR_EL2_APIBKey);