{"id":808930,"url":"http://patchwork.ozlabs.org/api/1.0/patches/808930/?format=json","project":{"id":14,"url":"http://patchwork.ozlabs.org/api/1.0/projects/14/?format=json","name":"QEMU Development","link_name":"qemu-devel","list_id":"qemu-devel.nongnu.org","list_email":"qemu-devel@nongnu.org","web_url":"","scm_url":"","webscm_url":""},"msgid":"<20170901180340.30009-20-eblake@redhat.com>","date":"2017-09-01T18:03:30","name":"[v6,19/29] postcopy-test: Drop dependence on global_qtest","commit_ref":null,"pull_url":null,"state":"new","archived":false,"hash":"7ae77aa85e0ab14cfc9e01222b8f50c0b582156d","submitter":{"id":6591,"url":"http://patchwork.ozlabs.org/api/1.0/people/6591/?format=json","name":"Eric Blake","email":"eblake@redhat.com"},"delegate":null,"mbox":"http://patchwork.ozlabs.org/project/qemu-devel/patch/20170901180340.30009-20-eblake@redhat.com/mbox/","series":[{"id":1089,"url":"http://patchwork.ozlabs.org/api/1.0/series/1089/?format=json","date":"2017-09-01T18:03:12","name":"Preliminary libqtest cleanups","version":6,"mbox":"http://patchwork.ozlabs.org/series/1089/mbox/"}],"check":"pending","checks":"http://patchwork.ozlabs.org/api/patches/808930/checks/","tags":{},"headers":{"Return-Path":"","X-Original-To":"incoming@patchwork.ozlabs.org","Delivered-To":"patchwork-incoming@bilbo.ozlabs.org","Authentication-Results":["ozlabs.org;\n\tspf=pass (mailfrom) smtp.mailfrom=nongnu.org\n\t(client-ip=2001:4830:134:3::11; helo=lists.gnu.org;\n\tenvelope-from=qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org;\n\treceiver=)","ext-mx01.extmail.prod.ext.phx2.redhat.com;\n\tdmarc=none (p=none dis=none) header.from=redhat.com","ext-mx01.extmail.prod.ext.phx2.redhat.com;\n\tspf=fail smtp.mailfrom=eblake@redhat.com"],"Received":["from lists.gnu.org (lists.gnu.org [IPv6:2001:4830:134:3::11])\n\t(using TLSv1 with cipher AES256-SHA (256/256 bits))\n\t(No client certificate requested)\n\tby ozlabs.org (Postfix) with ESMTPS id 3xkSD54k6nz9sMN\n\tfor ;\n\tSat, 2 Sep 2017 04:18:29 +1000 (AEST)","from localhost ([::1]:53170 helo=lists.gnu.org)\n\tby lists.gnu.org with esmtp (Exim 4.71) (envelope-from\n\t)\n\tid 1dnqWR-0003zV-K9\n\tfor incoming@patchwork.ozlabs.org; Fri, 01 Sep 2017 14:18:27 -0400","from eggs.gnu.org ([2001:4830:134:3::10]:56099)\n\tby lists.gnu.org with esmtp (Exim 4.71)\n\t(envelope-from ) id 1dnqIn-0007PZ-1G\n\tfor qemu-devel@nongnu.org; Fri, 01 Sep 2017 14:04:22 -0400","from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71)\n\t(envelope-from ) id 1dnqIh-0001rD-Sj\n\tfor qemu-devel@nongnu.org; Fri, 01 Sep 2017 14:04:21 -0400","from mx1.redhat.com ([209.132.183.28]:53452)\n\tby eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32)\n\t(Exim 4.71) (envelope-from ) id 1dnqIh-0001qN-Kk\n\tfor qemu-devel@nongnu.org; Fri, 01 Sep 2017 14:04:15 -0400","from smtp.corp.redhat.com\n\t(int-mx05.intmail.prod.int.phx2.redhat.com [10.5.11.15])\n\t(using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits))\n\t(No client certificate requested)\n\tby mx1.redhat.com (Postfix) with ESMTPS id B384E81E0C\n\tfor ; Fri, 1 Sep 2017 18:04:14 +0000 (UTC)","from red.redhat.com (ovpn-121-149.rdu2.redhat.com [10.10.121.149])\n\tby smtp.corp.redhat.com (Postfix) with ESMTP id EF5DE627DE;\n\tFri, 1 Sep 2017 18:04:13 +0000 (UTC)"],"DMARC-Filter":"OpenDMARC Filter v1.3.2 mx1.redhat.com B384E81E0C","From":"Eric Blake ","To":"qemu-devel@nongnu.org","Date":"Fri, 1 Sep 2017 13:03:30 -0500","Message-Id":"<20170901180340.30009-20-eblake@redhat.com>","In-Reply-To":"<20170901180340.30009-1-eblake@redhat.com>","References":"<20170901180340.30009-1-eblake@redhat.com>","X-Scanned-By":"MIMEDefang 2.79 on 10.5.11.15","X-Greylist":"Sender IP whitelisted, not delayed by milter-greylist-4.5.16\n\t(mx1.redhat.com [10.5.110.25]);\n\tFri, 01 Sep 2017 18:04:14 +0000 (UTC)","X-detected-operating-system":"by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic]\n\t[fuzzy]","X-Received-From":"209.132.183.28","Subject":"[Qemu-devel] [PATCH v6 19/29] postcopy-test: Drop dependence on\n\tglobal_qtest","X-BeenThere":"qemu-devel@nongnu.org","X-Mailman-Version":"2.1.21","Precedence":"list","List-Id":"","List-Unsubscribe":",\n\t","List-Archive":"","List-Post":"","List-Help":"","List-Subscribe":",\n\t","Cc":"pbonzini@redhat.com, armbru@redhat.com","Errors-To":"qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org","Sender":"\"Qemu-devel\"\n\t"},"content":"Managing parallel connections to two different monitors via\nthe implicit global_qtest makes it hard to copy-and-paste code\nto tests that are not aware of the implicit state. We are\nalready half-using the explicit APIs, so fix the remaining\nspots to also be explicit about which connection is in use,\nand avoid global_qtest.\n\nWe can assert that the conversion is correct by checking that\nglobal_qtest remains NULL throughout the test (a later patch\nthat changes global_qtest to not be a public global variable\nwill drop the assertions).\n\nSigned-off-by: Eric Blake \n---\n tests/postcopy-test.c | 84 ++++++++++++++++++++++++---------------------------\n 1 file changed, 40 insertions(+), 44 deletions(-)","diff":"diff --git a/tests/postcopy-test.c b/tests/postcopy-test.c\nindex 8142f2ab90..0e5fe20a83 100644\n--- a/tests/postcopy-test.c\n+++ b/tests/postcopy-test.c\n@@ -223,7 +223,7 @@ static void wait_for_serial(const char *side)\n /*\n * Events can get in the way of responses we are actually waiting for.\n */\n-static QDict *return_or_event(QDict *response)\n+static QDict *return_or_event(QTestState *qts, QDict *response)\n {\n const char *event_string;\n if (!qdict_haskey(response, \"event\")) {\n@@ -236,7 +236,7 @@ static QDict *return_or_event(QDict *response)\n got_stop = true;\n }\n QDECREF(response);\n- return return_or_event(qtest_qmp_receive(global_qtest));\n+ return return_or_event(qts, qtest_qmp_receive(qts));\n }\n\n\n@@ -247,12 +247,13 @@ static QDict *return_or_event(QDict *response)\n * going postcopy.\n */\n\n-static uint64_t get_migration_pass(void)\n+static uint64_t get_migration_pass(QTestState *qts)\n {\n QDict *rsp, *rsp_return, *rsp_ram;\n uint64_t result;\n\n- rsp = return_or_event(qmp(\"{ 'execute': 'query-migrate' }\"));\n+ rsp = return_or_event(qts,\n+ qtest_qmp(qts, \"{ 'execute': 'query-migrate' }\"));\n rsp_return = qdict_get_qdict(rsp, \"return\");\n if (!qdict_haskey(rsp_return, \"ram\")) {\n /* Still in setup */\n@@ -265,7 +266,7 @@ static uint64_t get_migration_pass(void)\n return result;\n }\n\n-static void wait_for_migration_complete(void)\n+static void wait_for_migration_complete(QTestState *qts)\n {\n QDict *rsp, *rsp_return;\n bool completed;\n@@ -273,7 +274,8 @@ static void wait_for_migration_complete(void)\n do {\n const char *status;\n\n- rsp = return_or_event(qmp(\"{ 'execute': 'query-migrate' }\"));\n+ rsp = return_or_event(qts,\n+ qtest_qmp(qts, \"{ 'execute': 'query-migrate' }\"));\n rsp_return = qdict_get_qdict(rsp, \"return\");\n status = qdict_get_str(rsp_return, \"status\");\n completed = strcmp(status, \"completed\") == 0;\n@@ -283,14 +285,14 @@ static void wait_for_migration_complete(void)\n } while (!completed);\n }\n\n-static void wait_for_migration_pass(void)\n+static void wait_for_migration_pass(QTestState *qts)\n {\n- uint64_t initial_pass = get_migration_pass();\n+ uint64_t initial_pass = get_migration_pass(qts);\n uint64_t pass;\n\n /* Wait for the 1st sync */\n do {\n- initial_pass = get_migration_pass();\n+ initial_pass = get_migration_pass(qts);\n if (got_stop || initial_pass) {\n break;\n }\n@@ -299,11 +301,11 @@ static void wait_for_migration_pass(void)\n\n do {\n usleep(1000 * 100);\n- pass = get_migration_pass();\n+ pass = get_migration_pass(qts);\n } while (pass == initial_pass && !got_stop);\n }\n\n-static void check_guests_ram(void)\n+static void check_guests_ram(QTestState *qts)\n {\n /* Our ASM test will have been incrementing one byte from each page from\n * 1MB to <100MB in order.\n@@ -318,13 +320,13 @@ static void check_guests_ram(void)\n bool hit_edge = false;\n bool bad = false;\n\n- qtest_memread(global_qtest, start_address, &first_byte, 1);\n+ qtest_memread(qts, start_address, &first_byte, 1);\n last_byte = first_byte;\n\n for (address = start_address + 4096; address < end_address; address += 4096)\n {\n uint8_t b;\n- qtest_memread(global_qtest, address, &b, 1);\n+ qtest_memread(qts, address, &b, 1);\n if (b != last_byte) {\n if (((b + 1) % 256) == last_byte && !hit_edge) {\n /* This is OK, the guest stopped at the point of\n@@ -356,9 +358,9 @@ static void cleanup(const char *filename)\n static void test_migrate(void)\n {\n char *uri = g_strdup_printf(\"unix:%s/migsocket\", tmpfs);\n- QTestState *global = global_qtest, *from, *to;\n+ QTestState *from, *to;\n unsigned char dest_byte_a, dest_byte_b, dest_byte_c, dest_byte_d;\n- gchar *cmd, *cmd_src, *cmd_dst;\n+ gchar *cmd_src, *cmd_dst;\n QDict *rsp;\n\n char *bootpath = g_strdup_printf(\"%s/bootsect\", tmpfs);\n@@ -401,24 +403,24 @@ static void test_migrate(void)\n\n g_free(bootpath);\n\n- from = qtest_start(cmd_src);\n+ from = qtest_init(cmd_src);\n g_free(cmd_src);\n\n to = qtest_init(cmd_dst);\n g_free(cmd_dst);\n\n- global_qtest = from;\n- rsp = qmp(\"{ 'execute': 'migrate-set-capabilities',\"\n- \"'arguments': { \"\n+ assert(!global_qtest);\n+\n+ rsp = qtest_qmp(from, \"{ 'execute': 'migrate-set-capabilities',\"\n+ \"'arguments': { \"\n \"'capabilities': [ {\"\n \"'capability': 'postcopy-ram',\"\n \"'state': true } ] } }\");\n g_assert(qdict_haskey(rsp, \"return\"));\n QDECREF(rsp);\n\n- global_qtest = to;\n- rsp = qmp(\"{ 'execute': 'migrate-set-capabilities',\"\n- \"'arguments': { \"\n+ rsp = qtest_qmp(to, \"{ 'execute': 'migrate-set-capabilities',\"\n+ \"'arguments': { \"\n \"'capabilities': [ {\"\n \"'capability': 'postcopy-ram',\"\n \"'state': true } ] } }\");\n@@ -429,15 +431,14 @@ static void test_migrate(void)\n * quickly, but that it doesn't complete precopy even on a slow\n * machine, so also set the downtime.\n */\n- global_qtest = from;\n- rsp = qmp(\"{ 'execute': 'migrate_set_speed',\"\n- \"'arguments': { 'value': 100000000 } }\");\n+ rsp = qtest_qmp(from, \"{ 'execute': 'migrate_set_speed',\"\n+ \"'arguments': { 'value': 100000000 } }\");\n g_assert(qdict_haskey(rsp, \"return\"));\n QDECREF(rsp);\n\n /* 1ms downtime - it should never finish precopy */\n- rsp = qmp(\"{ 'execute': 'migrate_set_downtime',\"\n- \"'arguments': { 'value': 0.001 } }\");\n+ rsp = qtest_qmp(from, \"{ 'execute': 'migrate_set_downtime',\"\n+ \"'arguments': { 'value': 0.001 } }\");\n g_assert(qdict_haskey(rsp, \"return\"));\n QDECREF(rsp);\n\n@@ -445,35 +446,30 @@ static void test_migrate(void)\n /* Wait for the first serial output from the source */\n wait_for_serial(\"src_serial\");\n\n- cmd = g_strdup_printf(\"{ 'execute': 'migrate',\"\n- \"'arguments': { 'uri': '%s' } }\",\n- uri);\n- rsp = qmp(cmd);\n- g_free(cmd);\n+ rsp = qtest_qmp(from,\n+ \"{'execute': 'migrate', 'arguments': { 'uri': %s}}\", uri);\n g_assert(qdict_haskey(rsp, \"return\"));\n QDECREF(rsp);\n\n- wait_for_migration_pass();\n+ wait_for_migration_pass(from);\n\n- rsp = return_or_event(qmp(\"{ 'execute': 'migrate-start-postcopy' }\"));\n+ rsp = return_or_event(from,\n+ qtest_qmp(from,\n+ \"{ 'execute': 'migrate-start-postcopy' }\"));\n g_assert(qdict_haskey(rsp, \"return\"));\n QDECREF(rsp);\n\n if (!got_stop) {\n- qmp_eventwait(\"STOP\");\n+ qtest_qmp_eventwait(from, \"STOP\");\n }\n\n- global_qtest = to;\n- qmp_eventwait(\"RESUME\");\n+ qtest_qmp_eventwait(to, \"RESUME\");\n\n wait_for_serial(\"dest_serial\");\n- global_qtest = from;\n- wait_for_migration_complete();\n+ wait_for_migration_complete(from);\n\n qtest_quit(from);\n\n- global_qtest = to;\n-\n qtest_memread(to, start_address, &dest_byte_a, 1);\n\n /* Destination still running, wait for a byte to change */\n@@ -482,19 +478,19 @@ static void test_migrate(void)\n usleep(10 * 1000);\n } while (dest_byte_a == dest_byte_b);\n\n- qmp_discard_response(\"{ 'execute' : 'stop'}\");\n+ qtest_qmp_discard_response(to, \"{ 'execute' : 'stop'}\");\n /* With it stopped, check nothing changes */\n qtest_memread(to, start_address, &dest_byte_c, 1);\n sleep(1);\n qtest_memread(to, start_address, &dest_byte_d, 1);\n g_assert_cmpint(dest_byte_c, ==, dest_byte_d);\n\n- check_guests_ram();\n+ check_guests_ram(to);\n\n qtest_quit(to);\n g_free(uri);\n\n- global_qtest = global;\n+ assert(!global_qtest);\n\n cleanup(\"bootsect\");\n cleanup(\"migsocket\");\n","prefixes":["v6","19/29"]}