On Mon, Oct 17, 2022, Ricardo Koller wrote: > diff --git a/tools/testing/selftests/kvm/demand_paging_test.c b/tools/testing/selftests/kvm/demand_paging_test.c > index 779ae54f89c4..8e1fe4ffcccd 100644 > --- a/tools/testing/selftests/kvm/demand_paging_test.c > +++ b/tools/testing/selftests/kvm/demand_paging_test.c > @@ -22,23 +22,13 @@ > #include "test_util.h" > #include "perf_test_util.h" > #include "guest_modes.h" > +#include "userfaultfd_util.h" > > #ifdef __NR_userfaultfd > > -#ifdef PRINT_PER_PAGE_UPDATES > -#define PER_PAGE_DEBUG(...) printf(__VA_ARGS__) > -#else > -#define PER_PAGE_DEBUG(...) _no_printf(__VA_ARGS__) > -#endif > - > -#ifdef PRINT_PER_VCPU_UPDATES > -#define PER_VCPU_DEBUG(...) printf(__VA_ARGS__) > -#else > -#define PER_VCPU_DEBUG(...) _no_printf(__VA_ARGS__) > -#endif > - > static int nr_vcpus = 1; > static uint64_t guest_percpu_mem_size = DEFAULT_PER_VCPU_MEM_SIZE; > + > static size_t demand_paging_size; > static char *guest_data_prototype; > > @@ -67,9 +57,11 @@ static void vcpu_worker(struct perf_test_vcpu_args *vcpu_args) > ts_diff.tv_sec, ts_diff.tv_nsec); > } > > -static int handle_uffd_page_request(int uffd_mode, int uffd, uint64_t addr) > +static int handle_uffd_page_request(int uffd_mode, int uffd, > + struct uffd_msg *msg) Heh, one last alignment goof.