On Fri, Apr 10, 2020 at 04:16:58PM -0700, Sean Christopherson wrote:
> The sole caller of vm_vcpu_rm() already has the vcpu pointer, take it
> directly instead of doing an extra lookup.
>
> Signed-off-by: Sean Christopherson <sean.j.christopherson@xxxxxxxxx>
> ---
> tools/testing/selftests/kvm/lib/kvm_util.c | 7 +++----
> 1 file changed, 3 insertions(+), 4 deletions(-)
>
> diff --git a/tools/testing/selftests/kvm/lib/kvm_util.c b/tools/testing/selftests/kvm/lib/kvm_util.c
> index 8a3523d4434f..9a783c20dd26 100644
> --- a/tools/testing/selftests/kvm/lib/kvm_util.c
> +++ b/tools/testing/selftests/kvm/lib/kvm_util.c
> @@ -393,7 +393,7 @@ struct vcpu *vcpu_find(struct kvm_vm *vm, uint32_t vcpuid)
> *
> * Input Args:
> * vm - Virtual Machine
> - * vcpuid - VCPU ID
> + * vcpu - VCPU to remove
> *
> * Output Args: None
> *
> @@ -401,9 +401,8 @@ struct vcpu *vcpu_find(struct kvm_vm *vm, uint32_t vcpuid)
> *
> * Within the VM specified by vm, removes the VCPU given by vcpuid.
> */
> -static void vm_vcpu_rm(struct kvm_vm *vm, uint32_t vcpuid)
> +static void vm_vcpu_rm(struct kvm_vm *vm, struct vcpu *vcpu)
> {
> - struct vcpu *vcpu = vcpu_find(vm, vcpuid);
> int ret;
>
> ret = munmap(vcpu->state, sizeof(*vcpu->state));
> @@ -427,7 +426,7 @@ void kvm_vm_release(struct kvm_vm *vmp)
> int ret;
>
> while (vmp->vcpu_head)
> - vm_vcpu_rm(vmp, vmp->vcpu_head->id);
> + vm_vcpu_rm(vmp, vmp->vcpu_head);
>
> ret = close(vmp->fd);
> TEST_ASSERT(ret == 0, "Close of vm fd failed,\n"
> --
> 2.26.0
>
Reviewed-by: Andrew Jones <drjones@xxxxxxxxxx>
