Commit 375bdd3b authored by Dongjiu Geng's avatar Dongjiu Geng Committed by Marc Zyngier
Browse files

arm/arm64: KVM: Rename function kvm_arch_dev_ioctl_check_extension() 



Rename kvm_arch_dev_ioctl_check_extension() to
kvm_arch_vm_ioctl_check_extension(), because it does
not have any relationship with device.

Renaming this function can make code readable.

Cc: James Morse <james.morse@arm.com>
Reviewed-by: default avatarSuzuki K Poulose <suzuki.poulose@arm.com>
Signed-off-by: default avatarDongjiu Geng <gengdongjiu@huawei.com>
Signed-off-by: default avatarMarc Zyngier <marc.zyngier@arm.com>
parent da5a3ce6

arch/arm/include/asm/kvm_host.h

+1 −1
Original line number Diff line number Diff line
@@ -273,7 +273,7 @@ static inline void __cpu_init_stage2(void) 
	kvm_call_hyp(__init_stage2_translation);

}



static inline int kvm_arch_dev_ioctl_check_extension(struct kvm *kvm, long ext)

static inline int kvm_arch_vm_ioctl_check_extension(struct kvm *kvm, long ext)

{

	return 0;

}

arch/arm64/include/asm/kvm_host.h

+1 −1
Original line number Diff line number Diff line
@@ -53,7 +53,7 @@ DECLARE_STATIC_KEY_FALSE(userspace_irqchip_in_use); 


int __attribute_const__ kvm_target_cpu(void);

int kvm_reset_vcpu(struct kvm_vcpu *vcpu);

int kvm_arch_dev_ioctl_check_extension(struct kvm *kvm, long ext);

int kvm_arch_vm_ioctl_check_extension(struct kvm *kvm, long ext);

void __extended_idmap_trampoline(phys_addr_t boot_pgd, phys_addr_t idmap_start);



struct kvm_arch {

arch/arm64/kvm/reset.c

+2 −2
Original line number Diff line number Diff line
@@ -59,12 +59,12 @@ static bool cpu_has_32bit_el1(void) 
}



/**

 * kvm_arch_dev_ioctl_check_extension

 * kvm_arch_vm_ioctl_check_extension

 *

 * We currently assume that the number of HW registers is uniform

 * across all CPUs (see cpuinfo_sanity_check).

 */

int kvm_arch_dev_ioctl_check_extension(struct kvm *kvm, long ext)

int kvm_arch_vm_ioctl_check_extension(struct kvm *kvm, long ext)

{

	int r;

virt/kvm/arm/arm.c

+1 −1
Original line number Diff line number Diff line
@@ -241,7 +241,7 @@ int kvm_vm_ioctl_check_extension(struct kvm *kvm, long ext) 
		r = 1;

		break;

	default:

		r = kvm_arch_dev_ioctl_check_extension(kvm, ext);

		r = kvm_arch_vm_ioctl_check_extension(kvm, ext);

		break;

	}

	return r;

CRA Git | Maintained and supported by SUSTech CRA and CCSE