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

Commit 319f6f97 authored by Thomas Huth's avatar Thomas Huth Committed by Paolo Bonzini
Browse files

KVM: selftests: Compile code with warnings enabled 



So far the KVM selftests are compiled without any compiler warnings
enabled. That's quite bad, since we miss a lot of possible bugs this
way. Let's enable at least "-Wall" and some other useful warning flags
now, and fix at least the trivial problems in the code (like unused
variables).

Signed-off-by: default avatarThomas Huth <thuth@redhat.com>
Signed-off-by: default avatarPaolo Bonzini <pbonzini@redhat.com>
parent 3b339e25

tools/testing/selftests/kvm/Makefile

+3 −1
Original line number Diff line number Diff line
@@ -34,7 +34,9 @@ LIBKVM += $(LIBKVM_$(UNAME_M)) 
INSTALL_HDR_PATH = $(top_srcdir)/usr

LINUX_HDR_PATH = $(INSTALL_HDR_PATH)/include/

LINUX_TOOL_INCLUDE = $(top_srcdir)/tools/include

CFLAGS += -O2 -g -std=gnu99 -fno-stack-protector -fno-PIE -I$(LINUX_TOOL_INCLUDE) -I$(LINUX_HDR_PATH) -Iinclude -I$(<D) -Iinclude/$(UNAME_M) -I..

CFLAGS += -Wall -Wstrict-prototypes -Wuninitialized -O2 -g -std=gnu99 \

	-fno-stack-protector -fno-PIE -I$(LINUX_TOOL_INCLUDE) \

	-I$(LINUX_HDR_PATH) -Iinclude -I$(<D) -Iinclude/$(UNAME_M) -I..



no-pie-option := $(call try-run, echo 'int main() { return 0; }' | \

        $(CC) -Werror $(KBUILD_CPPFLAGS) $(CC_OPTION_CFLAGS) -no-pie -x c - -o "$$TMP", -no-pie)

tools/testing/selftests/kvm/dirty_log_test.c

+5 −1
Original line number Diff line number Diff line
@@ -131,6 +131,7 @@ static void *vcpu_worker(void *data) 
	while (!READ_ONCE(host_quit)) {

		/* Let the guest dirty the random pages */

		ret = _vcpu_run(vm, VCPU_ID);

		TEST_ASSERT(ret == 0, "vcpu_run failed: %d\n", ret);

		if (get_ucall(vm, VCPU_ID, &uc) == UCALL_SYNC) {

			pages_count += TEST_PAGES_PER_LOOP;

			generate_random_array(guest_array, TEST_PAGES_PER_LOOP);
@@ -426,8 +427,11 @@ int main(int argc, char *argv[]) 
	unsigned long interval = TEST_HOST_LOOP_INTERVAL;

	bool mode_selected = false;

	uint64_t phys_offset = 0;

	unsigned int mode, host_ipa_limit;

	unsigned int mode;

	int opt, i;

#ifdef __aarch64__

	unsigned int host_ipa_limit;

#endif



#ifdef USE_CLEAR_DIRTY_LOG

	if (!kvm_check_cap(KVM_CAP_MANUAL_DIRTY_LOG_PROTECT2)) {

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

+0 −3
Original line number Diff line number Diff line
@@ -135,7 +135,6 @@ struct kvm_vm *_vm_create(enum vm_guest_mode mode, uint64_t phy_pages, 
			  int perm, unsigned long type)

{

	struct kvm_vm *vm;

	int kvm_fd;



	vm = calloc(1, sizeof(*vm));

	TEST_ASSERT(vm != NULL, "Insufficient Memory");
@@ -556,7 +555,6 @@ void vm_userspace_mem_region_add(struct kvm_vm *vm, 
	uint32_t flags)

{

	int ret;

	unsigned long pmem_size = 0;

	struct userspace_mem_region *region;

	size_t huge_page_size = KVM_UTIL_PGS_PER_HUGEPG * vm->page_size;
@@ -1334,7 +1332,6 @@ void vcpu_sregs_set(struct kvm_vm *vm, uint32_t vcpuid, struct kvm_sregs *sregs) 
int _vcpu_sregs_set(struct kvm_vm *vm, uint32_t vcpuid, struct kvm_sregs *sregs)

{

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

	int ret;



	TEST_ASSERT(vcpu != NULL, "vcpu not found, vcpuid: %u", vcpuid);

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

+1 −3
Original line number Diff line number Diff line
@@ -229,8 +229,6 @@ void sregs_dump(FILE *stream, struct kvm_sregs *sregs, 


void virt_pgd_alloc(struct kvm_vm *vm, uint32_t pgd_memslot)

{

	int rc;



	TEST_ASSERT(vm->mode == VM_MODE_P52V48_4K, "Attempt to use "

		"unknown or unsupported guest mode, mode: 0x%x", vm->mode);
@@ -549,7 +547,6 @@ vm_paddr_t addr_gva2gpa(struct kvm_vm *vm, vm_vaddr_t gva) 
	struct pageDirectoryPointerEntry *pdpe;

	struct pageDirectoryEntry *pde;

	struct pageTableEntry *pte;

	void *hva;



	TEST_ASSERT(vm->mode == VM_MODE_P52V48_4K, "Attempt to use "

		"unknown or unsupported guest mode, mode: 0x%x", vm->mode);
@@ -582,6 +579,7 @@ vm_paddr_t addr_gva2gpa(struct kvm_vm *vm, vm_vaddr_t gva) 
unmapped_gva:

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

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

	exit(EXIT_FAILURE);

}



static void kvm_setup_gdt(struct kvm_vm *vm, struct kvm_dtable *dt, int gdt_memslot,

tools/testing/selftests/kvm/x86_64/cr4_cpuid_sync_test.c

+1 −0
Original line number Diff line number Diff line
@@ -87,6 +87,7 @@ int main(int argc, char *argv[]) 
	while (1) {

		rc = _vcpu_run(vm, VCPU_ID);



		TEST_ASSERT(rc == 0, "vcpu_run failed: %d\n", rc);

		TEST_ASSERT(run->exit_reason == KVM_EXIT_IO,

			    "Unexpected exit reason: %u (%s),\n",

			    run->exit_reason,