KVM: selftests: Enable printf format warnings for TEST_ASSERT (d9eaf19e) · Commits · 戴 / test

tools/testing/selftests/kvm/demand_paging_test.c

+1 −1

Original line number	Diff line number	Diff line
		@@ -384,7 +384,7 @@ static void run_test(enum vm_guest_mode mode, bool use_uffd,
		*/
		TEST_ASSERT(guest_num_pages < vm_get_max_gfn(vm),
		"Requested more guest memory than address space allows.\n"
		" guest pages: %lx max gfn: %lx vcpus: %d wss: %lx]\n",
		" guest pages: %lx max gfn: %x vcpus: %d wss: %lx]\n",
		guest_num_pages, vm_get_max_gfn(vm), vcpus,
		vcpu_memory_bytes);

+2 −1

Original line number	Diff line number	Diff line
		@@ -37,7 +37,8 @@ ssize_t test_read(int fd, void *buf, size_t count);
		int test_seq_read(const char path, char bufp, size_t sizep);

		void test_assert(bool exp, const char *exp_str,
		const char file, unsigned int line, const char fmt, ...);
		const char file, unsigned int line, const char fmt, ...)
		__attribute__((format(printf, 5, 6)));

		#define TEST_ASSERT(e, fmt, ...) \
		test_assert((e), #e, __FILE__, __LINE__, fmt, ##__VA_ARGS__)

+4 −4

Original line number	Diff line number	Diff line
		@@ -265,7 +265,7 @@ void kvm_vm_restart(struct kvm_vm *vmp, int perm)
		TEST_ASSERT(ret == 0, "KVM_SET_USER_MEMORY_REGION IOCTL failed,\n"
		" rc: %i errno: %i\n"
		" slot: %u flags: 0x%x\n"
		" guest_phys_addr: 0x%lx size: 0x%lx",
		" guest_phys_addr: 0x%llx size: 0x%llx",
		ret, errno, region->region.slot,
		region->region.flags,
		region->region.guest_phys_addr,
		@@ -280,7 +280,7 @@ void kvm_vm_get_dirty_log(struct kvm_vm vm, int slot, void log)

		ret = ioctl(vm->fd, KVM_GET_DIRTY_LOG, &args);
		TEST_ASSERT(ret == 0, "%s: KVM_GET_DIRTY_LOG failed: %s",
		strerror(-ret));
		__func__, strerror(-ret));
		}

		void kvm_vm_clear_dirty_log(struct kvm_vm vm, int slot, void log,
		@@ -293,7 +293,7 @@ void kvm_vm_clear_dirty_log(struct kvm_vm vm, int slot, void log,

		ret = ioctl(vm->fd, KVM_CLEAR_DIRTY_LOG, &args);
		TEST_ASSERT(ret == 0, "%s: KVM_CLEAR_DIRTY_LOG failed: %s",
		strerror(-ret));
		__func__, strerror(-ret));
		}

		/*
		@@ -785,7 +785,7 @@ void vm_mem_region_move(struct kvm_vm *vm, uint32_t slot, uint64_t new_gpa)
		ret = ioctl(vm->fd, KVM_SET_USER_MEMORY_REGION, &region->region);

		TEST_ASSERT(!ret, "KVM_SET_USER_MEMORY_REGION failed\n"
		"ret: %i errno: %i slot: %u flags: 0x%x",
		"ret: %i errno: %i slot: %u flags: 0x%lx",
		ret, errno, slot, new_gpa);
		}

+2 −2

Original line number	Diff line number	Diff line
		@@ -109,7 +109,7 @@ int main(int argc, char *argv[])

		switch (get_ucall(vm, VCPU_ID, &uc)) {
		case UCALL_ABORT:
		TEST_ASSERT(false, "%s at %s:%d", (const char *)uc.args[0],
		TEST_ASSERT(false, "%s at %s:%ld", (const char *)uc.args[0],
		__FILE__, uc.args[1]);
		/* NOT REACHED */
		case UCALL_SYNC:
		@@ -122,7 +122,7 @@ int main(int argc, char *argv[])

		/* UCALL_SYNC is handled here. */
		TEST_ASSERT(!strcmp((const char *)uc.args[0], "hello") &&
		uc.args[1] == stage, "Unexpected register values vmexit #%lx, got %lx",
		uc.args[1] == stage, "Stage %d: Unexpected register values vmexit, got %lx",
		stage, (ulong)uc.args[1]);

		state = vcpu_save_state(vm, VCPU_ID);

+1 −1

Original line number	Diff line number	Diff line
		@@ -66,7 +66,7 @@ static void test_hv_cpuid(struct kvm_cpuid2 *hv_cpuid_entries,

		TEST_ASSERT((entry->function >= 0x40000000) &&
		(entry->function <= 0x4000000A),
		"function %lx is our of supported range",
		"function %x is our of supported range",
		entry->function);

		TEST_ASSERT(entry->index == 0,