From nobody Wed Nov 5 02:29:55 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 1532349350230265.18942359343816; Mon, 23 Jul 2018 05:35:50 -0700 (PDT) Received: from localhost ([::1]:34391 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1fha45-0005Fs-3P for importer@patchew.org; Mon, 23 Jul 2018 08:35:49 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:38474) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1fha1n-0003iY-VY for qemu-devel@nongnu.org; Mon, 23 Jul 2018 08:33:28 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1fha1l-0004so-52 for qemu-devel@nongnu.org; Mon, 23 Jul 2018 08:33:28 -0400 Received: from mx3-rdu2.redhat.com ([66.187.233.73]:48972 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 1fha1l-0004sY-0t for qemu-devel@nongnu.org; Mon, 23 Jul 2018 08:33:25 -0400 Received: from smtp.corp.redhat.com (int-mx04.intmail.prod.int.rdu2.redhat.com [10.11.54.4]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id A0B7240200AA for ; Mon, 23 Jul 2018 12:33:24 +0000 (UTC) Received: from xz-mi.redhat.com (ovpn-12-73.pek2.redhat.com [10.72.12.73]) by smtp.corp.redhat.com (Postfix) with ESMTP id 753742026D65; Mon, 23 Jul 2018 12:33:21 +0000 (UTC) From: Peter Xu To: qemu-devel@nongnu.org Date: Mon, 23 Jul 2018 20:33:05 +0800 Message-Id: <20180723123305.24792-5-peterx@redhat.com> In-Reply-To: <20180723123305.24792-1-peterx@redhat.com> References: <20180723123305.24792-1-peterx@redhat.com> X-Scanned-By: MIMEDefang 2.78 on 10.11.54.4 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.11.55.6]); Mon, 23 Jul 2018 12:33:24 +0000 (UTC) X-Greylist: inspected by milter-greylist-4.5.16 (mx1.redhat.com [10.11.55.6]); Mon, 23 Jul 2018 12:33:24 +0000 (UTC) for IP:'10.11.54.4' DOMAIN:'int-mx04.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/4] tests: torture release-ram in postcopy test 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" The release-ram capability will run some extra code for postcopy to release used ram right away, let's just turn that on for the postcopy unix test always to torture that code path too to make sure release-ram feature won't break again. The recovery test needs to turn that off since release-ram cannot coop with that. Signed-off-by: Peter Xu Reviewed-by: Juan Quintela --- tests/migration-test.c | 14 ++++++++++---- 1 file changed, 10 insertions(+), 4 deletions(-) diff --git a/tests/migration-test.c b/tests/migration-test.c index e079e0bdb6..deaec431fe 100644 --- a/tests/migration-test.c +++ b/tests/migration-test.c @@ -572,8 +572,9 @@ static void test_deprecated(void) } =20 static int migrate_postcopy_prepare(QTestState **from_ptr, - QTestState **to_ptr, - bool hide_error) + QTestState **to_ptr, + bool hide_error, + bool release_ram) { char *uri =3D g_strdup_printf("unix:%s/migsocket", tmpfs); QTestState *from, *to; @@ -582,6 +583,10 @@ static int migrate_postcopy_prepare(QTestState **from_= ptr, return -1; } =20 + if (release_ram) { + migrate_set_capability(from, "release-ram", "true"); + } + migrate_set_capability(from, "postcopy-ram", "true"); migrate_set_capability(to, "postcopy-ram", "true"); migrate_set_capability(to, "postcopy-blocktime", "true"); @@ -625,7 +630,7 @@ static void test_postcopy(void) { QTestState *from, *to; =20 - if (migrate_postcopy_prepare(&from, &to, false)) { + if (migrate_postcopy_prepare(&from, &to, false, true)) { return; } migrate_postcopy_start(from, to); @@ -637,7 +642,8 @@ static void test_postcopy_recovery(void) QTestState *from, *to; char *uri; =20 - if (migrate_postcopy_prepare(&from, &to, true)) { + /* The release-ram feature cannot work with postcopy recovery. */ + if (migrate_postcopy_prepare(&from, &to, true, false)) { return; } =20 --=20 2.17.1