diff options
| author |   Andrew Jones <drjones@redhat.com> | 2020-03-12 11:40:55 +0100 |
|---|---|---|
| committer |   Paolo Bonzini <pbonzini@redhat.com> | 2020-03-16 17:58:57 +0100 |
| commit | 331b4de9a7e780f9648ced959c08f4d593aa2e7b (patch) | |
| tree | 2603da283a97b9f4762bdaf2de81c7bcdc3131ba /tools/testing/selftests/kvm/include/kvm_util.h | |
| parent | kvm: svm: Introduce GA Log tracepoint for AVIC (diff) | |
| download | wireguard-linux-331b4de9a7e780f9648ced959c08f4d593aa2e7b.tar.xz wireguard-linux-331b4de9a7e780f9648ced959c08f4d593aa2e7b.zip | |
KVM: selftests: s390x: Provide additional num-guest-pages adjustment
s390 requires 1M aligned guest sizes. Embedding the rounding in
vm_adjust_num_guest_pages() allows us to remove it from a few
other places.
Signed-off-by: Andrew Jones <drjones@redhat.com>
Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
Diffstat (limited to '')
| -rw-r--r-- | tools/testing/selftests/kvm/include/kvm_util.h | 8 |
1 files changed, 7 insertions, 1 deletions
diff --git a/tools/testing/selftests/kvm/include/kvm_util.h b/tools/testing/selftests/kvm/include/kvm_util.h index 707b44805149..ade5a40afbee 100644 --- a/tools/testing/selftests/kvm/include/kvm_util.h +++ b/tools/testing/selftests/kvm/include/kvm_util.h @@ -164,7 +164,13 @@ unsigned int vm_num_guest_pages(enum vm_guest_mode mode, unsigned int num_host_p static inline unsigned int vm_adjust_num_guest_pages(enum vm_guest_mode mode, unsigned int num_guest_pages) { - return vm_num_guest_pages(mode, vm_num_host_pages(mode, num_guest_pages)); + unsigned int n; + n = vm_num_guest_pages(mode, vm_num_host_pages(mode, num_guest_pages)); +#ifdef __s390x__ + /* s390 requires 1M aligned guest sizes */ + n = (n + 255) & ~255; +#endif + return n; } struct kvm_userspace_memory_region * |