diff for duplicates of <1496229338-7113-1-git-send-email-thuth@redhat.com> diff --git a/a/1.txt b/N1/1.txt index 2a3ad31..9280d30 100644 --- a/a/1.txt +++ b/N1/1.txt @@ -102,9 +102,9 @@ index e18894b..afe4361 100644 - assert(query_token != RTAS_UNKNOWN_SERVICE && - start_token != RTAS_UNKNOWN_SERVICE); + ret = rtas_token("query-cpu-stopped-state", &query_token); -+ assert(ret = 0); ++ assert(ret == 0); + ret = rtas_token("start-cpu", &start_token); -+ assert(ret = 0); ++ assert(ret == 0); ret = rtas_call(query_token, 1, 2, outputs, cpu_id); if (ret) { @@ -124,9 +124,9 @@ index 1b1e9c7..5d43f33 100644 - token = rtas_token("get-time-of-day"); - report("token available", token != RTAS_UNKNOWN_SERVICE); -- if (token = RTAS_UNKNOWN_SERVICE) +- if (token == RTAS_UNKNOWN_SERVICE) + ret = rtas_token("get-time-of-day", &token); -+ report("token available", ret = 0); ++ report("token available", ret == 0); + if (ret) return; @@ -143,9 +143,9 @@ index 1b1e9c7..5d43f33 100644 - token = rtas_token("set-time-of-day"); - report("token available", token != RTAS_UNKNOWN_SERVICE); -- if (token = RTAS_UNKNOWN_SERVICE) +- if (token == RTAS_UNKNOWN_SERVICE) + ret = rtas_token("set-time-of-day", &stod_token); -+ report("token available", ret = 0); ++ report("token available", ret == 0); + if (ret) return; @@ -153,14 +153,14 @@ index 1b1e9c7..5d43f33 100644 - ret = rtas_call(token, 7, 1, NULL, 2000, 2, 28, 23, 59, 59); + ret = rtas_call(stod_token, 7, 1, NULL, 2000, 2, 28, 23, 59, 59); - report("execution", ret = 0); + report("execution", ret == 0); /* check it has worked */ - ret = rtas_call(rtas_token("get-time-of-day"), 0, 8, date); + ret = rtas_token("get-time-of-day", >od_token); -+ assert(ret = 0); ++ assert(ret == 0); + ret = rtas_call(gtod_token, 0, 8, date); - report("re-read", ret = 0); + report("re-read", ret == 0); t1 = mktime(2000, 2, 28, 23, 59, 59); t2 = mktime(date[0], date[1], date[2], @@ -100,7 +102,7 @@ static void check_set_time_of_day(void) diff --git a/a/content_digest b/N1/content_digest index 888aaea..cf9ea03 100644 --- a/a/content_digest +++ b/N1/content_digest @@ -1,6 +1,6 @@ "From\0Thomas Huth <thuth@redhat.com>\0" "Subject\0[kvm-unit-tests PATCH] powerpc: Rework the rtas_token() function\0" - "Date\0Wed, 31 May 2017 11:15:38 +0000\0" + "Date\0Wed, 31 May 2017 13:15:38 +0200\0" "To\0kvm@vger.kernel.org\0" "Cc\0kvm-ppc@vger.kernel.org" Laurent Vivier <lvivier@redhat.com> @@ -112,9 +112,9 @@ "-\tassert(query_token != RTAS_UNKNOWN_SERVICE &&\n" "-\t\tstart_token != RTAS_UNKNOWN_SERVICE);\n" "+\tret = rtas_token(\"query-cpu-stopped-state\", &query_token);\n" - "+\tassert(ret = 0);\n" + "+\tassert(ret == 0);\n" "+\tret = rtas_token(\"start-cpu\", &start_token);\n" - "+\tassert(ret = 0);\n" + "+\tassert(ret == 0);\n" " \n" " \tret = rtas_call(query_token, 1, 2, outputs, cpu_id);\n" " \tif (ret) {\n" @@ -134,9 +134,9 @@ " \n" "-\ttoken = rtas_token(\"get-time-of-day\");\n" "-\treport(\"token available\", token != RTAS_UNKNOWN_SERVICE);\n" - "-\tif (token = RTAS_UNKNOWN_SERVICE)\n" + "-\tif (token == RTAS_UNKNOWN_SERVICE)\n" "+\tret = rtas_token(\"get-time-of-day\", &token);\n" - "+\treport(\"token available\", ret = 0);\n" + "+\treport(\"token available\", ret == 0);\n" "+\tif (ret)\n" " \t\treturn;\n" " \n" @@ -153,9 +153,9 @@ " \n" "-\ttoken = rtas_token(\"set-time-of-day\");\n" "-\treport(\"token available\", token != RTAS_UNKNOWN_SERVICE);\n" - "-\tif (token = RTAS_UNKNOWN_SERVICE)\n" + "-\tif (token == RTAS_UNKNOWN_SERVICE)\n" "+\tret = rtas_token(\"set-time-of-day\", &stod_token);\n" - "+\treport(\"token available\", ret = 0);\n" + "+\treport(\"token available\", ret == 0);\n" "+\tif (ret)\n" " \t\treturn;\n" " \n" @@ -163,14 +163,14 @@ " \n" "-\tret = rtas_call(token, 7, 1, NULL, 2000, 2, 28, 23, 59, 59);\n" "+\tret = rtas_call(stod_token, 7, 1, NULL, 2000, 2, 28, 23, 59, 59);\n" - " \treport(\"execution\", ret = 0);\n" + " \treport(\"execution\", ret == 0);\n" " \n" " \t/* check it has worked */\n" "-\tret = rtas_call(rtas_token(\"get-time-of-day\"), 0, 8, date);\n" "+\tret = rtas_token(\"get-time-of-day\", >od_token);\n" - "+\tassert(ret = 0);\n" + "+\tassert(ret == 0);\n" "+\tret = rtas_call(gtod_token, 0, 8, date);\n" - " \treport(\"re-read\", ret = 0);\n" + " \treport(\"re-read\", ret == 0);\n" " \tt1 = mktime(2000, 2, 28, 23, 59, 59);\n" " \tt2 = mktime(date[0], date[1], date[2],\n" "@@ -100,7 +102,7 @@ static void check_set_time_of_day(void)\n" @@ -185,4 +185,4 @@ "-- \n" 1.8.3.1 -26bc496c81033b03750f1f1693fbdd052eaf06bb627b49eeb2f5d755f6ba03e3 +1c9f1e7b8af0d0d847cbaccdd600893b2c4610f97e586f483ef449a633a759fc
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.