Commit 6d85f51a authored by Thomas Huth's avatar Thomas Huth Committed by Sean Christopherson
Browse files

KVM: selftests: Rename the ASSERT_EQ macro 



There is already an ASSERT_EQ macro in the file
tools/testing/selftests/kselftest_harness.h, so currently KVM selftests
can't include test_util.h from the KVM selftests together with that file.
Rename the macro in the KVM selftests to TEST_ASSERT_EQ to avoid the
problem - it is also more similar to the other macros in test_util.h that
way.

Suggested-by: default avatarSean Christopherson <seanjc@google.com>
Signed-off-by: default avatarThomas Huth <thuth@redhat.com>
Reviewed-by: default avatarPhilippe Mathieu-Daudé <philmd@linaro.org>
Link: https://lore.kernel.org/r/20230712075910.22480-2-thuth@redhat.com


Signed-off-by: default avatarSean Christopherson <seanjc@google.com>
parent 7e4966e6

tools/testing/selftests/kvm/aarch64/aarch32_id_regs.c

+4 −4
Original line number Diff line number Diff line
@@ -98,7 +98,7 @@ static void test_user_raz_wi(struct kvm_vcpu *vcpu) 
		uint64_t val;



		vcpu_get_reg(vcpu, reg_id, &val);

		ASSERT_EQ(val, 0);

		TEST_ASSERT_EQ(val, 0);



		/*

		 * Expect the ioctl to succeed with no effect on the register
@@ -107,7 +107,7 @@ static void test_user_raz_wi(struct kvm_vcpu *vcpu) 
		vcpu_set_reg(vcpu, reg_id, BAD_ID_REG_VAL);



		vcpu_get_reg(vcpu, reg_id, &val);

		ASSERT_EQ(val, 0);

		TEST_ASSERT_EQ(val, 0);

	}

}
@@ -127,14 +127,14 @@ static void test_user_raz_invariant(struct kvm_vcpu *vcpu) 
		uint64_t val;



		vcpu_get_reg(vcpu, reg_id, &val);

		ASSERT_EQ(val, 0);

		TEST_ASSERT_EQ(val, 0);



		r = __vcpu_set_reg(vcpu, reg_id, BAD_ID_REG_VAL);

		TEST_ASSERT(r < 0 && errno == EINVAL,

			    "unexpected KVM_SET_ONE_REG error: r=%d, errno=%d", r, errno);



		vcpu_get_reg(vcpu, reg_id, &val);

		ASSERT_EQ(val, 0);

		TEST_ASSERT_EQ(val, 0);

	}

}

tools/testing/selftests/kvm/aarch64/page_fault_test.c

+5 −5
Original line number Diff line number Diff line
@@ -318,7 +318,7 @@ static int uffd_generic_handler(int uffd_mode, int uffd, struct uffd_msg *msg, 


	TEST_ASSERT(uffd_mode == UFFDIO_REGISTER_MODE_MISSING,

		    "The only expected UFFD mode is MISSING");

	ASSERT_EQ(addr, (uint64_t)args->hva);

	TEST_ASSERT_EQ(addr, (uint64_t)args->hva);



	pr_debug("uffd fault: addr=%p write=%d\n",

		 (void *)addr, !!(flags & UFFD_PAGEFAULT_FLAG_WRITE));
@@ -432,7 +432,7 @@ static void mmio_on_test_gpa_handler(struct kvm_vm *vm, struct kvm_run *run) 
	region = vm_get_mem_region(vm, MEM_REGION_TEST_DATA);

	hva = (void *)region->region.userspace_addr;



	ASSERT_EQ(run->mmio.phys_addr, region->region.guest_phys_addr);

	TEST_ASSERT_EQ(run->mmio.phys_addr, region->region.guest_phys_addr);



	memcpy(hva, run->mmio.data, run->mmio.len);

	events.mmio_exits += 1;
@@ -631,9 +631,9 @@ static void setup_default_handlers(struct test_desc *test) 


static void check_event_counts(struct test_desc *test)

{

	ASSERT_EQ(test->expected_events.uffd_faults, events.uffd_faults);

	ASSERT_EQ(test->expected_events.mmio_exits, events.mmio_exits);

	ASSERT_EQ(test->expected_events.fail_vcpu_runs, events.fail_vcpu_runs);

	TEST_ASSERT_EQ(test->expected_events.uffd_faults, events.uffd_faults);

	TEST_ASSERT_EQ(test->expected_events.mmio_exits, events.mmio_exits);

	TEST_ASSERT_EQ(test->expected_events.fail_vcpu_runs, events.fail_vcpu_runs);

}



static void print_test_banner(enum vm_guest_mode mode, struct test_params *p)

tools/testing/selftests/kvm/include/test_util.h

+2 −2
Original line number Diff line number Diff line
@@ -53,11 +53,11 @@ void test_assert(bool exp, const char *exp_str, 
#define TEST_ASSERT(e, fmt, ...) \

	test_assert((e), #e, __FILE__, __LINE__, fmt, ##__VA_ARGS__)



#define ASSERT_EQ(a, b) do { \

#define TEST_ASSERT_EQ(a, b) do { \

	typeof(a) __a = (a); \

	typeof(b) __b = (b); \

	TEST_ASSERT(__a == __b, \

		    "ASSERT_EQ(%s, %s) failed.\n" \

		    "TEST_ASSERT_EQ(%s, %s) failed.\n" \

		    "\t%s is %#lx\n" \

		    "\t%s is %#lx", \

		    #a, #b, #a, (unsigned long) __a, #b, (unsigned long) __b); \

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

+1 −1
Original line number Diff line number Diff line
@@ -994,7 +994,7 @@ void vm_userspace_mem_region_add(struct kvm_vm *vm, 
	if (src_type == VM_MEM_SRC_ANONYMOUS_THP)

		alignment = max(backing_src_pagesz, alignment);



	ASSERT_EQ(guest_paddr, align_up(guest_paddr, backing_src_pagesz));

	TEST_ASSERT_EQ(guest_paddr, align_up(guest_paddr, backing_src_pagesz));



	/* Add enough memory to align up if necessary */

	if (alignment > 1)

tools/testing/selftests/kvm/max_guest_memory_test.c

+1 −1
Original line number Diff line number Diff line
@@ -55,7 +55,7 @@ static void rendezvous_with_boss(void) 
static void run_vcpu(struct kvm_vcpu *vcpu)

{

	vcpu_run(vcpu);

	ASSERT_EQ(get_ucall(vcpu, NULL), UCALL_DONE);

	TEST_ASSERT_EQ(get_ucall(vcpu, NULL), UCALL_DONE);

}



static void *vcpu_worker(void *data)