diff for duplicates of <56BDD2A2.4010804@redhat.com> diff --git a/a/1.txt b/N1/1.txt index 78cb673..c4a9e6a 100644 --- a/a/1.txt +++ b/N1/1.txt @@ -71,15 +71,15 @@ On 08.02.2016 19:53, Andrew Jones wrote: > - var = split_var(argv[i], &val); > - if (!var) > + len = parse_keyval(argv[i], &val); -> + if (len = -1) +> + if (len == -1) > continue; > > - report_prefix_push(var); > + argv[i][len] = '\0'; > + report_prefix_push(argv[i]); > -> - if (strcmp(var, "mem") = 0) { -> + if (strcmp(argv[i], "mem") = 0) { +> - if (strcmp(var, "mem") == 0) { +> + if (strcmp(argv[i], "mem") == 0) { > > phys_addr_t memsize = PHYS_END - PHYS_OFFSET; > phys_addr_t expected = ((phys_addr_t)val)*1024*1024; @@ -87,10 +87,10 @@ On 08.02.2016 19:53, Andrew Jones wrote: > memsize/1024/1024); > ++nr_tests; > -> - } else if (strcmp(var, "smp") = 0) { -> + } else if (strcmp(argv[i], "smp") = 0) { +> - } else if (strcmp(var, "smp") == 0) { +> + } else if (strcmp(argv[i], "smp") == 0) { > -> report("nr_cpus = %d", nr_cpus = (int)val, nr_cpus); +> report("nr_cpus = %d", nr_cpus == (int)val, nr_cpus); > ++nr_tests; > @@ -72,7 +51,8 @@ static void check_setup(int argc, char **argv) > report_prefix_pop(); @@ -113,7 +113,7 @@ On 08.02.2016 19:53, Andrew Jones wrote: > + > report_prefix_push(argv[0]); > -> if (strcmp(argv[0], "setup") = 0) { +> if (strcmp(argv[0], "setup") == 0) { > diff --git a/config/config-arm-common.mak b/config/config-arm-common.mak > index 698555d6a676f..bd153cf6ea5ba 100644 > --- a/config/config-arm-common.mak diff --git a/a/content_digest b/N1/content_digest index 6330195..bd11f49 100644 --- a/a/content_digest +++ b/N1/content_digest @@ -2,7 +2,7 @@ "ref\01454957594-30601-3-git-send-email-drjones@redhat.com\0" "From\0Thomas Huth <thuth@redhat.com>\0" "Subject\0Re: [kvm-unit-tests PATCH v2 02/14] lib: share arm-selftest utility functions\0" - "Date\0Fri, 12 Feb 2016 12:40:02 +0000\0" + "Date\0Fri, 12 Feb 2016 13:40:02 +0100\0" "To\0Andrew Jones <drjones@redhat.com>" kvm@vger.kernel.org " kvm-ppc@vger.kernel.org\0" @@ -86,15 +86,15 @@ "> -\t\tvar = split_var(argv[i], &val);\n" "> -\t\tif (!var)\n" "> +\t\tlen = parse_keyval(argv[i], &val);\n" - "> +\t\tif (len = -1)\n" + "> +\t\tif (len == -1)\n" "> \t\t\tcontinue;\n" "> \n" "> -\t\treport_prefix_push(var);\n" "> +\t\targv[i][len] = '\\0';\n" "> +\t\treport_prefix_push(argv[i]);\n" "> \n" - "> -\t\tif (strcmp(var, \"mem\") = 0) {\n" - "> +\t\tif (strcmp(argv[i], \"mem\") = 0) {\n" + "> -\t\tif (strcmp(var, \"mem\") == 0) {\n" + "> +\t\tif (strcmp(argv[i], \"mem\") == 0) {\n" "> \n" "> \t\t\tphys_addr_t memsize = PHYS_END - PHYS_OFFSET;\n" "> \t\t\tphys_addr_t expected = ((phys_addr_t)val)*1024*1024;\n" @@ -102,10 +102,10 @@ "> \t\t\t\t\t\t\tmemsize/1024/1024);\n" "> \t\t\t++nr_tests;\n" "> \n" - "> -\t\t} else if (strcmp(var, \"smp\") = 0) {\n" - "> +\t\t} else if (strcmp(argv[i], \"smp\") = 0) {\n" + "> -\t\t} else if (strcmp(var, \"smp\") == 0) {\n" + "> +\t\t} else if (strcmp(argv[i], \"smp\") == 0) {\n" "> \n" - "> \t\t\treport(\"nr_cpus = %d\", nr_cpus = (int)val, nr_cpus);\n" + "> \t\t\treport(\"nr_cpus = %d\", nr_cpus == (int)val, nr_cpus);\n" "> \t\t\t++nr_tests;\n" "> @@ -72,7 +51,8 @@ static void check_setup(int argc, char **argv)\n" "> \t\treport_prefix_pop();\n" @@ -128,7 +128,7 @@ "> +\n" "> \treport_prefix_push(argv[0]);\n" "> \n" - "> \tif (strcmp(argv[0], \"setup\") = 0) {\n" + "> \tif (strcmp(argv[0], \"setup\") == 0) {\n" "> diff --git a/config/config-arm-common.mak b/config/config-arm-common.mak\n" "> index 698555d6a676f..bd153cf6ea5ba 100644\n" "> --- a/config/config-arm-common.mak\n" @@ -245,4 +245,4 @@ "\n" Reviewed-by: Thomas Huth <thuth@redhat.com> -9f6c3dd9a403730657a9dc143b89509fca16f3a8ead3e774bbef71a0d5bcc2bc +f1a0aa2cb7ec153e6fe9d0b51c952a7b63da6f6ef41c607d2462eec07a456238
This is an external index of several public inboxes, see mirroring instructions on how to clone and mirror all data and code used by this external index.