Skip to content

Commit

Permalink
KVM: arm64: Change the return type of kvm_vcpu_preferred_target()
Browse files Browse the repository at this point in the history
kvm_vcpu_preferred_target() always return 0 because kvm_target_cpu()
never returns a negative error code.

Signed-off-by: YueHaibing <yuehaibing@huawei.com>
Reviewed-by: Alexandru Elisei <alexandru.elisei@arm.com>
Signed-off-by: Marc Zyngier <maz@kernel.org>
Link: https://lore.kernel.org/r/20211105011500.16280-1-yuehaibing@huawei.com
  • Loading branch information
YueHaibing authored and Marc Zyngier committed Nov 8, 2021
1 parent deacd66 commit 08e873c
Showing 3 changed files with 3 additions and 11 deletions.
2 changes: 1 addition & 1 deletion arch/arm64/include/asm/kvm_host.h
Original file line number Diff line number Diff line change
@@ -584,7 +584,7 @@ struct kvm_vcpu_stat {
u64 exits;
};

int kvm_vcpu_preferred_target(struct kvm_vcpu_init *init);
void kvm_vcpu_preferred_target(struct kvm_vcpu_init *init);
unsigned long kvm_arm_num_regs(struct kvm_vcpu *vcpu);
int kvm_arm_copy_reg_indices(struct kvm_vcpu *vcpu, u64 __user *indices);
int kvm_arm_get_reg(struct kvm_vcpu *vcpu, const struct kvm_one_reg *reg);
5 changes: 1 addition & 4 deletions arch/arm64/kvm/arm.c
Original file line number Diff line number Diff line change
@@ -1397,12 +1397,9 @@ long kvm_arch_vm_ioctl(struct file *filp,
return kvm_vm_ioctl_set_device_addr(kvm, &dev_addr);
}
case KVM_ARM_PREFERRED_TARGET: {
int err;
struct kvm_vcpu_init init;

err = kvm_vcpu_preferred_target(&init);
if (err)
return err;
kvm_vcpu_preferred_target(&init);

if (copy_to_user(argp, &init, sizeof(init)))
return -EFAULT;
7 changes: 1 addition & 6 deletions arch/arm64/kvm/guest.c
Original file line number Diff line number Diff line change
@@ -869,13 +869,10 @@ u32 __attribute_const__ kvm_target_cpu(void)
return KVM_ARM_TARGET_GENERIC_V8;
}

int kvm_vcpu_preferred_target(struct kvm_vcpu_init *init)
void kvm_vcpu_preferred_target(struct kvm_vcpu_init *init)
{
u32 target = kvm_target_cpu();

if (target < 0)
return -ENODEV;

memset(init, 0, sizeof(*init));

/*
@@ -885,8 +882,6 @@ int kvm_vcpu_preferred_target(struct kvm_vcpu_init *init)
* target type.
*/
init->target = (__u32)target;

return 0;
}

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

0 comments on commit 08e873c

Please sign in to comment.