Commit 238022ff authored by Sean Christopherson's avatar Sean Christopherson Committed by Paolo Bonzini

KVM: selftests: Take vcpu pointer instead of id in vm_vcpu_rm()

The sole caller of vm_vcpu_rm() already has the vcpu pointer, take it
directly instead of doing an extra lookup.
Signed-off-by: default avatarSean Christopherson <sean.j.christopherson@intel.com>
Reviewed-by: default avatarWainer dos Santos Moschetta <wainersm@redhat.com>
Reviewed-by: default avatarAndrew Jones <drjones@redhat.com>
Message-Id: <20200410231707.7128-2-sean.j.christopherson@intel.com>
Signed-off-by: default avatarPaolo Bonzini <pbonzini@redhat.com>
parent 43d05de2
...@@ -393,7 +393,7 @@ struct vcpu *vcpu_find(struct kvm_vm *vm, uint32_t vcpuid) ...@@ -393,7 +393,7 @@ struct vcpu *vcpu_find(struct kvm_vm *vm, uint32_t vcpuid)
* *
* Input Args: * Input Args:
* vm - Virtual Machine * vm - Virtual Machine
* vcpuid - VCPU ID * vcpu - VCPU to remove
* *
* Output Args: None * Output Args: None
* *
...@@ -401,9 +401,8 @@ struct vcpu *vcpu_find(struct kvm_vm *vm, uint32_t vcpuid) ...@@ -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. * 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; int ret;
ret = munmap(vcpu->state, sizeof(*vcpu->state)); ret = munmap(vcpu->state, sizeof(*vcpu->state));
...@@ -427,7 +426,7 @@ void kvm_vm_release(struct kvm_vm *vmp) ...@@ -427,7 +426,7 @@ void kvm_vm_release(struct kvm_vm *vmp)
int ret; int ret;
while (vmp->vcpu_head) while (vmp->vcpu_head)
vm_vcpu_rm(vmp, vmp->vcpu_head->id); vm_vcpu_rm(vmp, vmp->vcpu_head);
ret = close(vmp->fd); ret = close(vmp->fd);
TEST_ASSERT(ret == 0, "Close of vm fd failed,\n" TEST_ASSERT(ret == 0, "Close of vm fd failed,\n"
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment