This series has several parts: * First, a hack to get x86 to compile. The missing __NR_userfaultfd define should be fixed a better way. * Then, fixups for several commits in kvm/queue. These fixups correspond to review comments that didn't have a chance to get addressed before the commits were applied. * Next, a few unnecessary #define/#ifdef deletions. * Then, a rework of debug and info message printing. * Finally, an addition to the API, num-pages conversion utilities, which cleans up all the num-pages calculations. Andrew Jones (13): HACK: Ensure __NR_userfaultfd is defined fixup! KVM: selftests: Add support for vcpu_args_set to aarch64 and s390x fixup! KVM: selftests: Support multiple vCPUs in demand paging test fixup! KVM: selftests: Add memory size parameter to the demand paging test fixup! KVM: selftests: Time guest demand paging KVM: selftests: Remove unnecessary defines KVM: selftests: aarch64: Remove unnecessary ifdefs KVM: selftests: aarch64: Use stream when given KVM: selftests: Rework debug message printing KVM: selftests: Convert some printf's to pr_info's KVM: selftests: Rename vm_guest_mode_params KVM: selftests: Introduce vm_guest_mode_params KVM: selftests: Introduce num-pages conversion utilities .../selftests/kvm/demand_paging_test.c | 148 ++++++++---------- tools/testing/selftests/kvm/dirty_log_test.c | 78 +++++---- .../testing/selftests/kvm/include/kvm_util.h | 14 +- .../testing/selftests/kvm/include/test_util.h | 18 +++ .../selftests/kvm/kvm_create_max_vcpus.c | 8 +- .../selftests/kvm/lib/aarch64/processor.c | 30 +--- tools/testing/selftests/kvm/lib/kvm_util.c | 89 +++++++---- .../selftests/kvm/lib/kvm_util_internal.h | 11 -- tools/testing/selftests/kvm/lib/test_util.c | 90 ++++++----- tools/testing/selftests/kvm/s390x/resets.c | 6 +- .../selftests/kvm/x86_64/mmio_warning_test.c | 2 +- tools/testing/selftests/kvm/x86_64/smm_test.c | 2 +- .../testing/selftests/kvm/x86_64/state_test.c | 2 +- .../kvm/x86_64/vmx_tsc_adjust_test.c | 4 +- .../selftests/kvm/x86_64/xss_msr_test.c | 2 +- 15 files changed, 258 insertions(+), 246 deletions(-) -- 2.21.1