From nobody Tue Nov 4 22:05:02 2025 Delivered-To: importer@patchew.org Received-SPF: pass (zoho.com: domain of gnu.org designates 208.118.235.17 as permitted sender) client-ip=208.118.235.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Authentication-Results: mx.zohomail.com; spf=pass (zoho.com: domain of gnu.org designates 208.118.235.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail(p=none dis=none) header.from=redhat.com Return-Path: Received: from lists.gnu.org (lists.gnu.org [208.118.235.17]) by mx.zohomail.com with SMTPS id 153076107349892.19774349314787; Wed, 4 Jul 2018 20:24:33 -0700 (PDT) Received: from localhost ([::1]:50099 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1fausi-0000Qk-RW for importer@patchew.org; Wed, 04 Jul 2018 23:24:32 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:49830) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1fauma-00048s-B4 for qemu-devel@nongnu.org; Wed, 04 Jul 2018 23:18:13 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1faumY-0001qr-AW for qemu-devel@nongnu.org; Wed, 04 Jul 2018 23:18:12 -0400 Received: from mx3-rdu2.redhat.com ([66.187.233.73]:47298 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 1faumY-0001pi-5W for qemu-devel@nongnu.org; Wed, 04 Jul 2018 23:18:10 -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 D4CDB81A4EAD for ; Thu, 5 Jul 2018 03:18:09 +0000 (UTC) Received: from xz-mi.nay.redhat.com (dhcp-14-142.nay.redhat.com [10.66.14.142]) by smtp.corp.redhat.com (Postfix) with ESMTP id E49502156889; Thu, 5 Jul 2018 03:18:07 +0000 (UTC) From: Peter Xu To: qemu-devel@nongnu.org Date: Thu, 5 Jul 2018 11:17:50 +0800 Message-Id: <20180705031755.3254-5-peterx@redhat.com> In-Reply-To: <20180705031755.3254-1-peterx@redhat.com> References: <20180705031755.3254-1-peterx@redhat.com> X-Scanned-By: MIMEDefang 2.78 on 10.11.54.6 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.11.55.8]); Thu, 05 Jul 2018 03:18:09 +0000 (UTC) X-Greylist: inspected by milter-greylist-4.5.16 (mx1.redhat.com [10.11.55.8]); Thu, 05 Jul 2018 03:18:09 +0000 (UTC) for IP:'10.11.54.6' DOMAIN:'int-mx06.intmail.prod.int.rdu2.redhat.com' HELO:'smtp.corp.redhat.com' FROM:'peterx@redhat.com' RCPT:'' X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] [fuzzy] X-Received-From: 66.187.233.73 Subject: [Qemu-devel] [PATCH for-3.0 4/9] tests: introduce migrate_postcopy_* helpers X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: "Dr . David Alan Gilbert" , peterx@redhat.com, Juan Quintela Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail: RSF_0 Z_629925259 SPT_0 Content-Transfer-Encoding: quoted-printable MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Separate the old postcopy UNIX socket test into three steps, provide a helper for each step. With these helpers, we can do more compliated tests like postcopy recovery, while keep the codes shared. Signed-off-by: Peter Xu Reviewed-by: Balamuruhan S Reviewed-by: Dr. David Alan Gilbert Reviewed-by: Juan Quintela --- tests/migration-test.c | 38 +++++++++++++++++++++++++++----------- 1 file changed, 27 insertions(+), 11 deletions(-) diff --git a/tests/migration-test.c b/tests/migration-test.c index 3a85446f95..2155869b96 100644 --- a/tests/migration-test.c +++ b/tests/migration-test.c @@ -351,13 +351,19 @@ static void migrate(QTestState *who, const char *uri) qobject_unref(rsp); } =20 -static void migrate_start_postcopy(QTestState *who) +static void migrate_postcopy_start(QTestState *from, QTestState *to) { QDict *rsp; =20 - rsp =3D wait_command(who, "{ 'execute': 'migrate-start-postcopy' }"); + rsp =3D wait_command(from, "{ 'execute': 'migrate-start-postcopy' }"); g_assert(qdict_haskey(rsp, "return")); qobject_unref(rsp); + + if (!got_stop) { + qtest_qmp_eventwait(from, "STOP"); + } + + qtest_qmp_eventwait(to, "RESUME"); } =20 static void test_migrate_start(QTestState **from, QTestState **to, @@ -505,7 +511,8 @@ static void test_deprecated(void) qtest_quit(from); } =20 -static void test_postcopy(void) +static void migrate_postcopy_prepare(QTestState **from_ptr, + QTestState **to_ptr) { char *uri =3D g_strdup_printf("unix:%s/migsocket", tmpfs); QTestState *from, *to; @@ -527,28 +534,37 @@ static void test_postcopy(void) wait_for_serial("src_serial"); =20 migrate(from, uri); + g_free(uri); =20 wait_for_migration_pass(from); =20 - migrate_start_postcopy(from); - - if (!got_stop) { - qtest_qmp_eventwait(from, "STOP"); - } + *from_ptr =3D from; + *to_ptr =3D to; +} =20 - qtest_qmp_eventwait(to, "RESUME"); +static void migrate_postcopy_complete(QTestState *from, QTestState *to) +{ + wait_for_migration_complete(from); =20 + /* Make sure we get at least one "B" on destination */ wait_for_serial("dest_serial"); - wait_for_migration_complete(from); =20 if (uffd_feature_thread_id) { read_blocktime(to); } - g_free(uri); =20 test_migrate_end(from, to, true); } =20 +static void test_postcopy(void) +{ + QTestState *from, *to; + + migrate_postcopy_prepare(&from, &to); + migrate_postcopy_start(from, to); + migrate_postcopy_complete(from, to); +} + static void test_baddest(void) { QTestState *from, *to; --=20 2.17.1