Commit 352be2c5 authored by Wainer dos Santos Moschetta's avatar Wainer dos Santos Moschetta Committed by Paolo Bonzini
Browse files

selftests: kvm: Uses TEST_FAIL in tests/utilities 



Changed all tests and utilities to use TEST_FAIL macro
instead of TEST_ASSERT(false,...).

Signed-off-by: default avatarWainer dos Santos Moschetta <wainersm@redhat.com>
Signed-off-by: default avatarPaolo Bonzini <pbonzini@redhat.com>
parent a46f8a63

tools/testing/selftests/kvm/dirty_log_test.c

+3 −4
Original line number Diff line number Diff line
@@ -166,8 +166,7 @@ static void *vcpu_worker(void *data) 
			pages_count += TEST_PAGES_PER_LOOP;

			generate_random_array(guest_array, TEST_PAGES_PER_LOOP);

		} else {

			TEST_ASSERT(false,

				    "Invalid guest sync status: "

			TEST_FAIL("Invalid guest sync status: "

				  "exit_reason=%s\n",

				  exit_reason_str(run->exit_reason));

		}

tools/testing/selftests/kvm/lib/aarch64/processor.c

+8 −9
Original line number Diff line number Diff line
@@ -130,7 +130,7 @@ void _virt_pg_map(struct kvm_vm *vm, uint64_t vaddr, uint64_t paddr, 
		ptep = addr_gpa2hva(vm, pte_addr(vm, *ptep)) + pte_index(vm, vaddr) * 8;

		break;

	default:

		TEST_ASSERT(false, "Page table levels must be 2, 3, or 4");

		TEST_FAIL("Page table levels must be 2, 3, or 4");

	}



	*ptep = paddr | 3;
@@ -173,14 +173,13 @@ vm_paddr_t addr_gva2gpa(struct kvm_vm *vm, vm_vaddr_t gva) 
			goto unmapped_gva;

		break;

	default:

		TEST_ASSERT(false, "Page table levels must be 2, 3, or 4");

		TEST_FAIL("Page table levels must be 2, 3, or 4");

	}



	return pte_addr(vm, *ptep) + (gva & (vm->page_size - 1));



unmapped_gva:

	TEST_ASSERT(false, "No mapping for vm virtual address, "

		    "gva: 0x%lx", gva);

	TEST_FAIL("No mapping for vm virtual address, gva: 0x%lx", gva);

	exit(1);

}
@@ -262,10 +261,10 @@ void aarch64_vcpu_setup(struct kvm_vm *vm, int vcpuid, struct kvm_vcpu_init *ini 


	switch (vm->mode) {

	case VM_MODE_P52V48_4K:

		TEST_ASSERT(false, "AArch64 does not support 4K sized pages "

		TEST_FAIL("AArch64 does not support 4K sized pages "

			  "with 52-bit physical address ranges");

	case VM_MODE_PXXV48_4K:

		TEST_ASSERT(false, "AArch64 does not support 4K sized pages "

		TEST_FAIL("AArch64 does not support 4K sized pages "

			  "with ANY-bit physical address ranges");

	case VM_MODE_P52V48_64K:

		tcr_el1 |= 1ul << 14; /* TG0 = 64KB */
@@ -288,7 +287,7 @@ void aarch64_vcpu_setup(struct kvm_vm *vm, int vcpuid, struct kvm_vcpu_init *ini 
		tcr_el1 |= 2ul << 32; /* IPS = 40 bits */

		break;

	default:

		TEST_ASSERT(false, "Unknown guest mode, mode: 0x%x", vm->mode);

		TEST_FAIL("Unknown guest mode, mode: 0x%x", vm->mode);

	}



	sctlr_el1 |= (1 << 0) | (1 << 2) | (1 << 12) /* M | C | I */;

tools/testing/selftests/kvm/lib/aarch64/ucall.c

+1 −1
Original line number Diff line number Diff line
@@ -62,7 +62,7 @@ void ucall_init(struct kvm_vm *vm, void *arg) 
		if (ucall_mmio_init(vm, start + offset))

			return;

	}

	TEST_ASSERT(false, "Can't find a ucall mmio address");

	TEST_FAIL("Can't find a ucall mmio address");

}



void ucall_uninit(struct kvm_vm *vm)

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

+6 −6
Original line number Diff line number Diff line
@@ -61,7 +61,7 @@ ssize_t test_write(int fd, const void *buf, size_t count) 
			continue;



		case 0:

			TEST_ASSERT(false, "Unexpected EOF,\n"

			TEST_FAIL("Unexpected EOF,\n"

				  "  rc: %zi num_written: %zi num_left: %zu",

				  rc, num_written, num_left);

			break;
@@ -138,7 +138,7 @@ ssize_t test_read(int fd, void *buf, size_t count) 
			break;



		case 0:

			TEST_ASSERT(false, "Unexpected EOF,\n"

			TEST_FAIL("Unexpected EOF,\n"

				  "   rc: %zi num_read: %zi num_left: %zu",

				  rc, num_read, num_left);

			break;

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

+9 −12
Original line number Diff line number Diff line
@@ -198,12 +198,11 @@ struct kvm_vm *_vm_create(enum vm_guest_mode mode, uint64_t phy_pages, int perm) 
			 vm->pa_bits);

		vm->pgtable_levels = 4;

#else

		TEST_ASSERT(false, "VM_MODE_PXXV48_4K not supported on "

			    "non-x86 platforms");

		TEST_FAIL("VM_MODE_PXXV48_4K not supported on non-x86 platforms");

#endif

		break;

	default:

		TEST_ASSERT(false, "Unknown guest mode, mode: 0x%x", mode);

		TEST_FAIL("Unknown guest mode, mode: 0x%x", mode);

	}



#ifdef __aarch64__
@@ -603,7 +602,7 @@ void vm_userspace_mem_region_add(struct kvm_vm *vm, 
	region = (struct userspace_mem_region *) userspace_mem_region_find(

		vm, guest_paddr, (guest_paddr + npages * vm->page_size) - 1);

	if (region != NULL)

		TEST_ASSERT(false, "overlapping userspace_mem_region already "

		TEST_FAIL("overlapping userspace_mem_region already "

			"exists\n"

			"  requested guest_paddr: 0x%lx npages: 0x%lx "

			"page_size: 0x%x\n"
@@ -619,7 +618,7 @@ void vm_userspace_mem_region_add(struct kvm_vm *vm, 
			break;

	}

	if (region != NULL)

		TEST_ASSERT(false, "A mem region with the requested slot "

		TEST_FAIL("A mem region with the requested slot "

			"already exists.\n"

			"  requested slot: %u paddr: 0x%lx npages: 0x%lx\n"

			"  existing slot: %u paddr: 0x%lx size: 0x%lx",
@@ -723,7 +722,7 @@ memslot2region(struct kvm_vm *vm, uint32_t memslot) 
			"  requested slot: %u\n", memslot);

		fputs("---- vm dump ----\n", stderr);

		vm_dump(stderr, vm, 2);

		TEST_ASSERT(false, "Mem region not found");

		TEST_FAIL("Mem region not found");

	}



	return region;
@@ -841,7 +840,7 @@ void vm_vcpu_add(struct kvm_vm *vm, uint32_t vcpuid) 
	/* Confirm a vcpu with the specified id doesn't already exist. */

	vcpu = vcpu_find(vm, vcpuid);

	if (vcpu != NULL)

		TEST_ASSERT(false, "vcpu with the specified id "

		TEST_FAIL("vcpu with the specified id "

			"already exists,\n"

			"  requested vcpuid: %u\n"

			"  existing vcpuid: %u state: %p",
@@ -934,8 +933,7 @@ static vm_vaddr_t vm_vaddr_unused_gap(struct kvm_vm *vm, size_t sz, 
	} while (pgidx_start != 0);



no_va_found:

	TEST_ASSERT(false, "No vaddr of specified pages available, "

		"pages: 0x%lx", pages);

	TEST_FAIL("No vaddr of specified pages available, pages: 0x%lx", pages);



	/* NOT REACHED */

	return -1;
@@ -1070,7 +1068,7 @@ void *addr_gpa2hva(struct kvm_vm *vm, vm_paddr_t gpa) 
				+ (gpa - region->region.guest_phys_addr));

	}



	TEST_ASSERT(false, "No vm physical memory at 0x%lx", gpa);

	TEST_FAIL("No vm physical memory at 0x%lx", gpa);

	return NULL;

}
@@ -1104,8 +1102,7 @@ vm_paddr_t addr_hva2gpa(struct kvm_vm *vm, void *hva) 
				+ (hva - (uintptr_t) region->host_mem));

	}



	TEST_ASSERT(false, "No mapping to a guest physical address, "

		"hva: %p", hva);

	TEST_FAIL("No mapping to a guest physical address, hva: %p", hva);

	return -1;

}

CRA Git | Maintained and supported by SUSTech CRA and CCSE