diff options
author | Paolo Bonzini <pbonzini@redhat.com> | 2021-07-08 20:15:57 +0300 |
---|---|---|
committer | Paolo Bonzini <pbonzini@redhat.com> | 2021-07-14 19:14:27 +0300 |
commit | f3cf800778e9e76b2387d00c9bfbc2e16efdb7ed (patch) | |
tree | 783e27546a8d65df254f59b5a024dc42eb390582 /tools/testing/selftests/kvm/set_memory_region_test.c | |
parent | b8917b4ae44d1b945f6fba3d8ee6777edb44633b (diff) | |
parent | cd4220d23bf3f43cf720e82bdee681f383433ae2 (diff) | |
download | linux-f3cf800778e9e76b2387d00c9bfbc2e16efdb7ed.tar.xz |
Merge tag 'kvm-s390-master-5.14-1' of git://git.kernel.org/pub/scm/linux/kernel/git/kvms390/linux into HEAD
KVM: selftests: Fixes
- provide memory model for IBM z196 and zEC12
- do not require 64GB of memory
Diffstat (limited to 'tools/testing/selftests/kvm/set_memory_region_test.c')
-rw-r--r-- | tools/testing/selftests/kvm/set_memory_region_test.c | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/tools/testing/selftests/kvm/set_memory_region_test.c b/tools/testing/selftests/kvm/set_memory_region_test.c index d79d58eada9f..72a1c9b4882c 100644 --- a/tools/testing/selftests/kvm/set_memory_region_test.c +++ b/tools/testing/selftests/kvm/set_memory_region_test.c @@ -376,8 +376,9 @@ static void test_add_max_memory_regions(void) pr_info("Adding slots 0..%i, each memory region with %dK size\n", (max_mem_slots - 1), MEM_REGION_SIZE >> 10); - mem = mmap(NULL, MEM_REGION_SIZE * max_mem_slots + alignment, - PROT_READ | PROT_WRITE, MAP_PRIVATE | MAP_ANONYMOUS, -1, 0); + mem = mmap(NULL, (size_t)max_mem_slots * MEM_REGION_SIZE + alignment, + PROT_READ | PROT_WRITE, + MAP_PRIVATE | MAP_ANONYMOUS | MAP_NORESERVE, -1, 0); TEST_ASSERT(mem != MAP_FAILED, "Failed to mmap() host"); mem_aligned = (void *)(((size_t) mem + alignment - 1) & ~(alignment - 1)); @@ -401,7 +402,7 @@ static void test_add_max_memory_regions(void) TEST_ASSERT(ret == -1 && errno == EINVAL, "Adding one more memory slot should fail with EINVAL"); - munmap(mem, MEM_REGION_SIZE * max_mem_slots + alignment); + munmap(mem, (size_t)max_mem_slots * MEM_REGION_SIZE + alignment); munmap(mem_extra, MEM_REGION_SIZE); kvm_vm_free(vm); } |