diff options
author | Andrew Jones <drjones@redhat.com> | 2019-05-23 13:05:46 +0200 |
---|---|---|
committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2019-06-19 08:00:12 +0200 |
commit | 14be6a9888534e9671ae5a91abfead030bd64a2b (patch) | |
tree | 8c5c94c43d2ee2db0b5bc00a3c87abfb357e376a | |
parent | 59bfd2405a5b9de5b5187e7e1f86297f82a0f6f3 (diff) | |
download | linux-stable-14be6a9888534e9671ae5a91abfead030bd64a2b.tar.gz linux-stable-14be6a9888534e9671ae5a91abfead030bd64a2b.tar.bz2 linux-stable-14be6a9888534e9671ae5a91abfead030bd64a2b.zip |
kvm: selftests: aarch64: fix default vm mode
[ Upstream commit 55eda003f02f075bab0223a188e548dbf3ac8dfe ]
VM_MODE_P52V48_4K is not a valid mode for AArch64. Replace its
use in vm_create_default() with a mode that works and represents
a good AArch64 default. (We didn't ever see a problem with this
because we don't have any unit tests using vm_create_default(),
but it's good to get it fixed in advance.)
Reported-by: Thomas Huth <thuth@redhat.com>
Signed-off-by: Andrew Jones <drjones@redhat.com>
Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
Signed-off-by: Sasha Levin <sashal@kernel.org>
-rw-r--r-- | tools/testing/selftests/kvm/lib/aarch64/processor.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/tools/testing/selftests/kvm/lib/aarch64/processor.c b/tools/testing/selftests/kvm/lib/aarch64/processor.c index e8c42506a09d..fa6cd340137c 100644 --- a/tools/testing/selftests/kvm/lib/aarch64/processor.c +++ b/tools/testing/selftests/kvm/lib/aarch64/processor.c @@ -226,7 +226,7 @@ struct kvm_vm *vm_create_default(uint32_t vcpuid, uint64_t extra_mem_pages, uint64_t extra_pg_pages = (extra_mem_pages / ptrs_per_4k_pte) * 2; struct kvm_vm *vm; - vm = vm_create(VM_MODE_P52V48_4K, DEFAULT_GUEST_PHY_PAGES + extra_pg_pages, O_RDWR); + vm = vm_create(VM_MODE_P40V48_4K, DEFAULT_GUEST_PHY_PAGES + extra_pg_pages, O_RDWR); kvm_vm_elf_load(vm, program_invocation_name, 0, 0); vm_vcpu_add_default(vm, vcpuid, guest_code); |