diff for duplicates of <5707BB69.6050301@redhat.com> diff --git a/a/1.txt b/N1/1.txt index 345c068..a00c479 100644 --- a/a/1.txt +++ b/N1/1.txt @@ -73,7 +73,7 @@ Ok, mfspr() is already used in spapr_hcall.c, too, so this is a good idea. >> + asm volatile (" sc 1 " : "+r"(r3), "+r"(r4), "=r"(r5) >> + : "r"(r3), "r"(r4)); >> + ->> + return r3 = H_SUCCESS && r4 > 0 ? r5 >> 48 : 0; +>> + return r3 == H_SUCCESS && r4 > 0 ? r5 >> 48 : 0; >> +} > > You may want this in hcall.h to share with other tests. @@ -106,7 +106,7 @@ Ok. >> + >> + if (argc > 0 && !strcmp(argv[0], "-w")) { >> + puts("Now migrate the VM, then press a key...\n"); ->> + while (h_get_term_char(0) = 0) +>> + while (h_get_term_char(0) == 0) >> + ; >> + } else { >> + puts("Parameter '-w' not specified - not waiting for a key.\n"); @@ -117,8 +117,8 @@ Ok. >> + puts("Checking SPRs...\n"); >> + for (i = 0; i < 1024; i++) { >> + if (before[i] != 0 || after[i] != 0) ->> + report("SPR %d:\t0x%016lx <=> 0x%016lx", ->> + before[i] = after[i], i, before[i], after[i]); +>> + report("SPR %d:\t0x%016lx <==> 0x%016lx", +>> + before[i] == after[i], i, before[i], after[i]); >> + } >> + >> + return report_summary(); diff --git a/a/content_digest b/N1/content_digest index 9b62501..4e354a7 100644 --- a/a/content_digest +++ b/N1/content_digest @@ -2,7 +2,7 @@ "ref\020160408121423.hjvv6l32lvv3ez6g@hawk.localdomain\0" "From\0Thomas Huth <thuth@redhat.com>\0" "Subject\0Re: [kvm-unit-tests PATCH] powerpc: Add SPRs migration test\0" - "Date\0Fri, 08 Apr 2016 14:08:41 +0000\0" + "Date\0Fri, 8 Apr 2016 16:08:41 +0200\0" "To\0Andrew Jones <drjones@redhat.com>\0" "Cc\0kvm@vger.kernel.org" kvm-ppc@vger.kernel.org @@ -87,7 +87,7 @@ ">> +\tasm volatile (\" sc 1 \"\t: \"+r\"(r3), \"+r\"(r4), \"=r\"(r5)\n" ">> +\t\t\t\t: \"r\"(r3), \"r\"(r4));\n" ">> +\n" - ">> +\treturn r3 = H_SUCCESS && r4 > 0 ? r5 >> 48 : 0;\n" + ">> +\treturn r3 == H_SUCCESS && r4 > 0 ? r5 >> 48 : 0;\n" ">> +}\n" "> \n" "> You may want this in hcall.h to share with other tests.\n" @@ -120,7 +120,7 @@ ">> +\n" ">> +\tif (argc > 0 && !strcmp(argv[0], \"-w\")) {\n" ">> +\t\tputs(\"Now migrate the VM, then press a key...\\n\");\n" - ">> +\t\twhile (h_get_term_char(0) = 0)\n" + ">> +\t\twhile (h_get_term_char(0) == 0)\n" ">> +\t\t\t;\n" ">> +\t} else {\n" ">> +\t\tputs(\"Parameter '-w' not specified - not waiting for a key.\\n\");\n" @@ -131,8 +131,8 @@ ">> +\tputs(\"Checking SPRs...\\n\");\n" ">> +\tfor (i = 0; i < 1024; i++) {\n" ">> +\t\tif (before[i] != 0 || after[i] != 0)\n" - ">> +\t\t\treport(\"SPR %d:\\t0x%016lx <=> 0x%016lx\",\n" - ">> +\t\t\t\tbefore[i] = after[i], i, before[i], after[i]);\n" + ">> +\t\t\treport(\"SPR %d:\\t0x%016lx <==> 0x%016lx\",\n" + ">> +\t\t\t\tbefore[i] == after[i], i, before[i], after[i]);\n" ">> +\t}\n" ">> +\n" ">> +\treturn report_summary();\n" @@ -159,4 +159,4 @@ "\n" Thomas -46ec8f302e18d9edefbcc7f579912140807ef3558a3fc06fee8ab11431778ec5 +181767c9c9e6ae962bfbf891c528db08c0615017abb30ba667457322a052160e
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.