KVM: selftests: Take vcpu pointer instead of id in vm_vcpu_rm() (238022ff) · Commits · 戴 / test

The sole caller of vm_vcpu_rm() already has the vcpu pointer, take it directly instead of doing an extra lookup. Signed-off-by:

Andrew Jones <drjones@redhat.com> Message-Id: <20200410231707.7128-2-sean.j.christopherson@intel.com> Signed-off-by:

tools/testing/selftests/kvm/lib/kvm_util.c

+3 −4

Original line number	Diff line number	Diff line
		@@ -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"