Commit 98e68344 authored by Andrew Jones's avatar Andrew Jones Committed by Paolo Bonzini

kvm: selftests: aarch64: compile with warnings on

aarch64 fixups needed to compile with warnings as errors.
Reviewed-by: default avatarThomas Huth <thuth@redhat.com>
Signed-off-by: default avatarAndrew Jones <drjones@redhat.com>
Signed-off-by: default avatarPaolo Bonzini <pbonzini@redhat.com>
parent 55eda003
...@@ -7,6 +7,8 @@ ...@@ -7,6 +7,8 @@
#define _GNU_SOURCE /* for program_invocation_name */ #define _GNU_SOURCE /* for program_invocation_name */
#include <linux/compiler.h>
#include "kvm_util.h" #include "kvm_util.h"
#include "../kvm_util_internal.h" #include "../kvm_util_internal.h"
#include "processor.h" #include "processor.h"
...@@ -67,15 +69,13 @@ static uint64_t ptrs_per_pgd(struct kvm_vm *vm) ...@@ -67,15 +69,13 @@ static uint64_t ptrs_per_pgd(struct kvm_vm *vm)
return 1 << (vm->va_bits - shift); 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); return 1 << (vm->page_shift - 3);
} }
void virt_pgd_alloc(struct kvm_vm *vm, uint32_t pgd_memslot) void virt_pgd_alloc(struct kvm_vm *vm, uint32_t pgd_memslot)
{ {
int rc;
if (!vm->pgd_created) { if (!vm->pgd_created) {
vm_paddr_t paddr = vm_phy_pages_alloc(vm, vm_paddr_t paddr = vm_phy_pages_alloc(vm,
page_align(vm, ptrs_per_pgd(vm) * 8) / vm->page_size, 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) ...@@ -181,6 +181,7 @@ vm_paddr_t addr_gva2gpa(struct kvm_vm *vm, vm_vaddr_t gva)
unmapped_gva: unmapped_gva:
TEST_ASSERT(false, "No mapping for vm virtual address, " TEST_ASSERT(false, "No mapping for vm virtual address, "
"gva: 0x%lx", gva); "gva: 0x%lx", gva);
exit(1);
} }
static void pte_dump(FILE *stream, struct kvm_vm *vm, uint8_t indent, uint64_t page, int level) 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) ...@@ -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.pstate), &pstate);
get_reg(vm, vcpuid, ARM64_CORE_REG(regs.pc), &pc); 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); indent, "", pstate, pc);
} }
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment