From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:49899) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1faumj-0004Hb-8D for qemu-devel@nongnu.org; Wed, 04 Jul 2018 23:18:22 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1faumg-0002BE-1s for qemu-devel@nongnu.org; Wed, 04 Jul 2018 23:18:21 -0400 Received: from mx3-rdu2.redhat.com ([66.187.233.73]:47302 helo=mx1.redhat.com) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1faumf-0002AS-Sy for qemu-devel@nongnu.org; Wed, 04 Jul 2018 23:18:17 -0400 Received: from smtp.corp.redhat.com (int-mx06.intmail.prod.int.rdu2.redhat.com [10.11.54.6]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id 80D6A81A4EAD for ; Thu, 5 Jul 2018 03:18:17 +0000 (UTC) From: Peter Xu Date: Thu, 5 Jul 2018 11:17:53 +0800 Message-Id: <20180705031755.3254-8-peterx@redhat.com> In-Reply-To: <20180705031755.3254-1-peterx@redhat.com> References: <20180705031755.3254-1-peterx@redhat.com> Subject: [Qemu-devel] [PATCH for-3.0 7/9] tests: introduce wait_for_migration_status() List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Cc: Juan Quintela , "Dr . David Alan Gilbert" , peterx@redhat.com It's generalized from wait_for_migration_complete() to allow us to wait for any migration status besides failure. Signed-off-by: Peter Xu --- tests/migration-test.c | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/tests/migration-test.c b/tests/migration-test.c index 1d85ccbef1..761bf62ffe 100644 --- a/tests/migration-test.c +++ b/tests/migration-test.c @@ -231,14 +231,15 @@ static void read_blocktime(QTestState *who) qobject_unref(rsp_return); } -static void wait_for_migration_complete(QTestState *who) +static void wait_for_migration_status(QTestState *who, + const char *goal) { while (true) { bool completed; char *status; status = migrate_query_status(who); - completed = strcmp(status, "completed") == 0; + completed = strcmp(status, goal) == 0; g_assert_cmpstr(status, !=, "failed"); g_free(status); if (completed) { @@ -248,6 +249,11 @@ static void wait_for_migration_complete(QTestState *who) } } +static void wait_for_migration_complete(QTestState *who) +{ + wait_for_migration_status(who, "completed"); +} + static void wait_for_migration_pass(QTestState *who) { uint64_t initial_pass = get_migration_pass(who); -- 2.17.1