Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 0a505fe6 authored by Paolo Bonzini's avatar Paolo Bonzini
Browse files

kvm: selftests: ensure vcpu file is released 



The selftests were not munmap-ing the kvm_run area from the vcpu file descriptor.
The result was that kvm_vcpu_release was not called and a reference was left in the
parent "struct kvm".  Ultimately this was visible in the upcoming state save/restore
test as an error when KVM attempted to create a duplicate debugfs entry.

Signed-off-by: default avatarPaolo Bonzini <pbonzini@redhat.com>
parent 87ccb7db

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

+9 −1
Original line number Diff line number Diff line
@@ -238,8 +238,12 @@ struct vcpu *vcpu_find(struct kvm_vm *vm, 
static void vm_vcpu_rm(struct kvm_vm *vm, uint32_t vcpuid)

{

	struct vcpu *vcpu = vcpu_find(vm, vcpuid);

	int ret;



	int ret = close(vcpu->fd);

	ret = munmap(vcpu->state, sizeof(*vcpu->state));

	TEST_ASSERT(ret == 0, "munmap of VCPU fd failed, rc: %i "

		"errno: %i", ret, errno);

	close(vcpu->fd);

	TEST_ASSERT(ret == 0, "Close of VCPU fd failed, rc: %i "

		"errno: %i", ret, errno);
@@ -295,6 +299,10 @@ void kvm_vm_free(struct kvm_vm *vmp) 
	TEST_ASSERT(ret == 0, "Close of vm fd failed,\n"

		"  vmp->fd: %i rc: %i errno: %i", vmp->fd, ret, errno);



	close(vmp->kvm_fd);

	TEST_ASSERT(ret == 0, "Close of /dev/kvm fd failed,\n"

		"  vmp->kvm_fd: %i rc: %i errno: %i", vmp->kvm_fd, ret, errno);



	/* Free the structure describing the VM. */

	free(vmp);

}