On Wed, Sep 15, 2021 at 2:30 PM David Matlack <dmatlack@xxxxxxxxxx> wrote:
>
> Every other KVM selftest uses -s for the backing_src, so switch
> demand_paging_test to match.
>
> Signed-off-by: David Matlack <dmatlack@xxxxxxxxxx>
Reviewed-by: Ben Gardon <bgardon@xxxxxxxxxx>
> ---
> tools/testing/selftests/kvm/demand_paging_test.c | 10 +++++-----
> 1 file changed, 5 insertions(+), 5 deletions(-)
>
> diff --git a/tools/testing/selftests/kvm/demand_paging_test.c b/tools/testing/selftests/kvm/demand_paging_test.c
> index e79c1b64977f..735c081e774e 100644
> --- a/tools/testing/selftests/kvm/demand_paging_test.c
> +++ b/tools/testing/selftests/kvm/demand_paging_test.c
> @@ -416,7 +416,7 @@ static void help(char *name)
> {
> puts("");
> printf("usage: %s [-h] [-m vm_mode] [-u uffd_mode] [-d uffd_delay_usec]\n"
> - " [-b memory] [-t type] [-v vcpus] [-o]\n", name);
> + " [-b memory] [-s type] [-v vcpus] [-o]\n", name);
> guest_modes_help();
> printf(" -u: use userfaultfd to handle vCPU page faults. Mode is a\n"
> " UFFD registration mode: 'MISSING' or 'MINOR'.\n");
> @@ -426,7 +426,7 @@ static void help(char *name)
> printf(" -b: specify the size of the memory region which should be\n"
> " demand paged by each vCPU. e.g. 10M or 3G.\n"
> " Default: 1G\n");
> - printf(" -t: The type of backing memory to use. Default: anonymous\n");
> + printf(" -s: The type of backing memory to use. Default: anonymous\n");
> backing_src_help();
> printf(" -v: specify the number of vCPUs to run.\n");
> printf(" -o: Overlap guest memory accesses instead of partitioning\n"
> @@ -446,7 +446,7 @@ int main(int argc, char *argv[])
>
> guest_modes_append_default();
>
> - while ((opt = getopt(argc, argv, "hm:u:d:b:t:v:o")) != -1) {
> + while ((opt = getopt(argc, argv, "hm:u:d:b:s:v:o")) != -1) {
> switch (opt) {
> case 'm':
> guest_modes_cmdline(optarg);
> @@ -465,7 +465,7 @@ int main(int argc, char *argv[])
> case 'b':
> guest_percpu_mem_size = parse_size(optarg);
> break;
> - case 't':
> + case 's':
> p.src_type = parse_backing_src_type(optarg);
> break;
> case 'v':
> @@ -485,7 +485,7 @@ int main(int argc, char *argv[])
>
> if (p.uffd_mode == UFFDIO_REGISTER_MODE_MINOR &&
> !backing_src_is_shared(p.src_type)) {
> - TEST_FAIL("userfaultfd MINOR mode requires shared memory; pick a different -t");
> + TEST_FAIL("userfaultfd MINOR mode requires shared memory; pick a different -s");
> }
>
> for_each_guest_mode(run_test, &p);
> --
> 2.33.0.309.g3052b89438-goog
>
