]> git.proxmox.com Git - mirror_ubuntu-eoan-kernel.git/commitdiff
kvm: selftests: aarch64: compile with warnings on
authorAndrew Jones <drjones@redhat.com>
Thu, 23 May 2019 10:16:34 +0000 (12:16 +0200)
committerPaolo Bonzini <pbonzini@redhat.com>
Fri, 24 May 2019 19:27:16 +0000 (21:27 +0200)
aarch64 fixups needed to compile with warnings as errors.

Reviewed-by: Thomas Huth <thuth@redhat.com>
Signed-off-by: Andrew Jones <drjones@redhat.com>
Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
tools/testing/selftests/kvm/lib/aarch64/processor.c

index fa6cd340137c5a231c18f14d9ce3b7972add97ae..19e667911496cd42bb8a513fd122706e0f6c3d17 100644 (file)
@@ -7,6 +7,8 @@
 
 #define _GNU_SOURCE /* for program_invocation_name */
 
+#include <linux/compiler.h>
+
 #include "kvm_util.h"
 #include "../kvm_util_internal.h"
 #include "processor.h"
@@ -67,15 +69,13 @@ static uint64_t ptrs_per_pgd(struct kvm_vm *vm)
        return 1 << (vm->va_bits - shift);
 }
 
-static uint64_t ptrs_per_pte(struct kvm_vm *vm)
+static uint64_t __maybe_unused ptrs_per_pte(struct kvm_vm *vm)
 {
        return 1 << (vm->page_shift - 3);
 }
 
 void virt_pgd_alloc(struct kvm_vm *vm, uint32_t pgd_memslot)
 {
-       int rc;
-
        if (!vm->pgd_created) {
                vm_paddr_t paddr = vm_phy_pages_alloc(vm,
                        page_align(vm, ptrs_per_pgd(vm) * 8) / vm->page_size,
@@ -181,6 +181,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(1);
 }
 
 static void pte_dump(FILE *stream, struct kvm_vm *vm, uint8_t indent, uint64_t page, int level)
@@ -312,6 +313,6 @@ void vcpu_dump(FILE *stream, struct kvm_vm *vm, uint32_t vcpuid, uint8_t indent)
        get_reg(vm, vcpuid, ARM64_CORE_REG(regs.pstate), &pstate);
        get_reg(vm, vcpuid, ARM64_CORE_REG(regs.pc), &pc);
 
-       fprintf(stream, "%*spstate: 0x%.16llx pc: 0x%.16llx\n",
+       fprintf(stream, "%*spstate: 0x%.16lx pc: 0x%.16lx\n",
                indent, "", pstate, pc);
 }