Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 92e68b2b authored Apr 10, 2019 by Dave Martin Committed by Marc Zyngier Apr 18, 2019

KVM: arm/arm64: Clean up vcpu finalization function parameter naming



Currently, the internal vcpu finalization functions use a different
name ("what") for the feature parameter than the name ("feature")
used in the documentation.

To avoid future confusion, this patch converts everything to use
the name "feature" consistently.

No functional change.

Suggested-by: Andrew Jones <drjones@redhat.com>
Signed-off-by: Dave Martin <Dave.Martin@arm.com>
Reviewed-by: Andrew Jones <drjones@redhat.com>
Signed-off-by: Marc Zyngier <marc.zyngier@arm.com>

parent ecfb6ed4

arch/arm/include/asm/kvm_host.h

+1 −1

Original line number	Diff line number	Diff line
		@@ -412,7 +412,7 @@ static inline int kvm_arm_setup_stage2(struct kvm *kvm, unsigned long type)
		return 0;
		}

		static inline int kvm_arm_vcpu_finalize(struct kvm_vcpu *vcpu, int what)
		static inline int kvm_arm_vcpu_finalize(struct kvm_vcpu *vcpu, int feature)
		{
		return -EINVAL;
		}

arch/arm64/include/asm/kvm_host.h

+1 −1

Original line number	Diff line number	Diff line
		@@ -627,7 +627,7 @@ void kvm_arch_free_vm(struct kvm *kvm);

		int kvm_arm_setup_stage2(struct kvm *kvm, unsigned long type);

		int kvm_arm_vcpu_finalize(struct kvm_vcpu *vcpu, int what);
		int kvm_arm_vcpu_finalize(struct kvm_vcpu *vcpu, int feature);
		bool kvm_arm_vcpu_is_finalized(struct kvm_vcpu *vcpu);

		#define kvm_arm_vcpu_sve_finalized(vcpu) \

arch/arm64/kvm/reset.c

+2 −2

Original line number	Diff line number	Diff line
		@@ -186,9 +186,9 @@ static int kvm_vcpu_finalize_sve(struct kvm_vcpu *vcpu)
		return 0;
		}

		int kvm_arm_vcpu_finalize(struct kvm_vcpu *vcpu, int what)
		int kvm_arm_vcpu_finalize(struct kvm_vcpu *vcpu, int feature)
		{
		switch (what) {
		switch (feature) {
		case KVM_ARM_VCPU_SVE:
		if (!vcpu_has_sve(vcpu))
		return -EINVAL;