Skip to content

Commit 08e873c

Browse files
YueHaibingMarc Zyngier
authored andcommitted
KVM: arm64: Change the return type of kvm_vcpu_preferred_target()
kvm_vcpu_preferred_target() always return 0 because kvm_target_cpu() never returns a negative error code. Signed-off-by: YueHaibing <[email protected]> Reviewed-by: Alexandru Elisei <[email protected]> Signed-off-by: Marc Zyngier <[email protected]> Link: https://lore.kernel.org/r/[email protected]
1 parent deacd66 commit 08e873c

File tree

3 files changed

+3
-11
lines changed

3 files changed

+3
-11
lines changed

arch/arm64/include/asm/kvm_host.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -584,7 +584,7 @@ struct kvm_vcpu_stat {
584584
u64 exits;
585585
};
586586

587-
int kvm_vcpu_preferred_target(struct kvm_vcpu_init *init);
587+
void kvm_vcpu_preferred_target(struct kvm_vcpu_init *init);
588588
unsigned long kvm_arm_num_regs(struct kvm_vcpu *vcpu);
589589
int kvm_arm_copy_reg_indices(struct kvm_vcpu *vcpu, u64 __user *indices);
590590
int kvm_arm_get_reg(struct kvm_vcpu *vcpu, const struct kvm_one_reg *reg);

arch/arm64/kvm/arm.c

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1397,12 +1397,9 @@ long kvm_arch_vm_ioctl(struct file *filp,
13971397
return kvm_vm_ioctl_set_device_addr(kvm, &dev_addr);
13981398
}
13991399
case KVM_ARM_PREFERRED_TARGET: {
1400-
int err;
14011400
struct kvm_vcpu_init init;
14021401

1403-
err = kvm_vcpu_preferred_target(&init);
1404-
if (err)
1405-
return err;
1402+
kvm_vcpu_preferred_target(&init);
14061403

14071404
if (copy_to_user(argp, &init, sizeof(init)))
14081405
return -EFAULT;

arch/arm64/kvm/guest.c

Lines changed: 1 addition & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -869,13 +869,10 @@ u32 __attribute_const__ kvm_target_cpu(void)
869869
return KVM_ARM_TARGET_GENERIC_V8;
870870
}
871871

872-
int kvm_vcpu_preferred_target(struct kvm_vcpu_init *init)
872+
void kvm_vcpu_preferred_target(struct kvm_vcpu_init *init)
873873
{
874874
u32 target = kvm_target_cpu();
875875

876-
if (target < 0)
877-
return -ENODEV;
878-
879876
memset(init, 0, sizeof(*init));
880877

881878
/*
@@ -885,8 +882,6 @@ int kvm_vcpu_preferred_target(struct kvm_vcpu_init *init)
885882
* target type.
886883
*/
887884
init->target = (__u32)target;
888-
889-
return 0;
890885
}
891886

892887
int kvm_arch_vcpu_ioctl_get_fpu(struct kvm_vcpu *vcpu, struct kvm_fpu *fpu)

0 commit comments

Comments
 (0)