From nobody Sat May 18 17:34:40 2024 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1659016752; cv=none; d=zohomail.com; s=zohoarc; b=Pm4GgPotqm8D49VTmp+tgHETkOuMKUTKMVqwKLzMoOahDHsPhat91zNaa3UmTi8vIkSwC4Nejvm+u8yIlmnFm9vr4ME3MiskzqmAAdx9/kcC/PhgFqnTSPoBo6YgQk8dXgkEmG+/nAiRp7Hm4to3eX/NGiRKjuNkObYHx+nHKoY= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1659016752; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To; bh=tPRF2p8u4YeKt/QnPOCCUvF+2lq30TjQVJm1xC0AP3s=; b=Wc9PlALojHWQsOCLZ12Y+qFIm51nvYhDfc2Pl6/LiTcf+sJWkCYg+wtc5OOMPKLCy5HV4PvATgI1/WTDtd4DyIsgIjt1AIE2bn20Qdopa3Q5fcIp3cCOatQFU9tL5MW7MF7u4ibjoKlwwJxXNlk84WCuB/CVHjsIV2Dvm7RujkQ= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass header.from= (p=none dis=none) Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1659016752619301.05652140144036; Thu, 28 Jul 2022 06:59:12 -0700 (PDT) Received: from localhost ([::1]:57058 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1oH42h-000705-Et for importer@patchew.org; Thu, 28 Jul 2022 09:59:11 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:34692) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1oH3fg-0002If-Rx for qemu-devel@nongnu.org; Thu, 28 Jul 2022 09:35:39 -0400 Received: from us-smtp-delivery-124.mimecast.com ([170.10.133.124]:55597) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1oH3ff-0003im-9Q for qemu-devel@nongnu.org; Thu, 28 Jul 2022 09:35:24 -0400 Received: from mail-qk1-f198.google.com (mail-qk1-f198.google.com [209.85.222.198]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id us-mta-50-kDR077bjNj65GCpLVHiLyQ-1; Thu, 28 Jul 2022 09:35:21 -0400 Received: by mail-qk1-f198.google.com with SMTP id f20-20020a05620a409400b006b5fc740485so1459486qko.12 for ; Thu, 28 Jul 2022 06:35:21 -0700 (PDT) Received: from localhost.localdomain (bras-base-aurron9127w-grc-35-70-27-3-10.dsl.bell.ca. [70.27.3.10]) by smtp.gmail.com with ESMTPSA id x10-20020a05620a448a00b006b618e006ffsm553876qkp.2.2022.07.28.06.35.18 (version=TLS1_3 cipher=TLS_CHACHA20_POLY1305_SHA256 bits=256/256); Thu, 28 Jul 2022 06:35:19 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1659015322; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=tPRF2p8u4YeKt/QnPOCCUvF+2lq30TjQVJm1xC0AP3s=; b=GLsUu3PzZKIE2ssnk0mJ/iZeNQYaWUAjrpGt3QA415P4e1Ww8HObHEZc3OKkEWSflomTsf xI6zaYCSCvPLplGpZ6PCxflXBNPKjvEEyPOmUOcdFM2BPfc9JoydiDO+/sZh6TuQzJin5X iEsbtqL0UokyGcl57+x79QELkIfadSk= X-MC-Unique: kDR077bjNj65GCpLVHiLyQ-1 X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=tPRF2p8u4YeKt/QnPOCCUvF+2lq30TjQVJm1xC0AP3s=; b=Z2RrDCDdHUIorEA47tJUGyfQGwttqNJtbmzr6W6jz0ptQouPARXrLwOsrk3KkI9rsC vQUUVwDhdpUkGvM+xCLkd4Gm0V0f73umD8XixiTWTedQem5QqMr1b2aBUG1o76UOipO8 nWrFzrpn9LBZxKEHPi7/DtgGsjNPprjrfKpc9JFwBkSz2iP38mhZi4dctwyhVYbGjZdm F67Swc3RkK5M1Sj9YKQ/CCbrOj9ySsS4I3/bcE36N/ZH70IE5bCDqvgIYC3cGma9trHn n0AmzGQ3/OWAMPv5uM4Y/kh7LPzMZL/NTKorbaS2QcJsmBgwD9QVcjx/6922z8cawR2C YB0A== X-Gm-Message-State: AJIora/NL/aCAGbZLyP4aTbKGbJzOG4L0Z+qh+bCif+Gcrom4clAyN8h OhF0/2PK3UCvQzvtxWAZEO4xVy6ira2dbFY68hQdrDICQAAvcVI+x2bSoqPGGKpo0EHQzzBlceF xtK7yT7f8n8ZvSxxqt5yWZO0v2XMtWhnZwKT3ENmcuMWJoHX7ANM5RNzBTQuWV98C X-Received: by 2002:ac8:5705:0:b0:31e:f49b:ed27 with SMTP id 5-20020ac85705000000b0031ef49bed27mr23010057qtw.16.1659015320658; Thu, 28 Jul 2022 06:35:20 -0700 (PDT) X-Google-Smtp-Source: AGRyM1taF0L0tY7IXZfZJ/8zcJ0vZnOkK15tOSh+dbDBQKBhcWQ6gZhN5dc0gZf5OBYMKSYSZakv3Q== X-Received: by 2002:ac8:5705:0:b0:31e:f49b:ed27 with SMTP id 5-20020ac85705000000b0031ef49bed27mr23010017qtw.16.1659015320324; Thu, 28 Jul 2022 06:35:20 -0700 (PDT) From: Peter Xu To: qemu-devel@nongnu.org Cc: Thomas Huth , "Dr . David Alan Gilbert" , peterx@redhat.com, Leonardo Bras Soares Passos , Juan Quintela , "Daniel P . Berrange" Subject: [PATCH v3 1/2] migration-test: Use migrate_ensure_converge() for auto-converge Date: Thu, 28 Jul 2022 09:35:15 -0400 Message-Id: <20220728133516.92061-2-peterx@redhat.com> X-Mailer: git-send-email 2.32.0 In-Reply-To: <20220728133516.92061-1-peterx@redhat.com> References: <20220728133516.92061-1-peterx@redhat.com> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Received-SPF: pass client-ip=170.10.133.124; envelope-from=peterx@redhat.com; helo=us-smtp-delivery-124.mimecast.com X-Spam_score_int: -21 X-Spam_score: -2.2 X-Spam_bar: -- X-Spam_report: (-2.2 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-0.082, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001, T_SCC_BODY_TEXT_LINE=-0.01 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: pass (identity @redhat.com) X-ZM-MESSAGEID: 1659016754098100001 Content-Type: text/plain; charset="utf-8" Thomas reported that auto-converge test will timeout on MacOS CI gatings. Use the migrate_ensure_converge() helper too in the auto-converge as when Daniel reworked the other test cases. Since both max_bandwidth / downtime_limit will not be used for converge calculations, make it simple by removing the remaining check, then we can completely remove both variables altogether, since migrate_ensure_converge is used the remaining check won't make much sense anyway. Suggested-by: Daniel P. Berrange Reported-by: Thomas Huth Reviewed-by: Daniel P. Berrange Signed-off-by: Peter Xu Tested-by: Thomas Huth --- tests/qtest/migration-test.c | 19 ++----------------- 1 file changed, 2 insertions(+), 17 deletions(-) diff --git a/tests/qtest/migration-test.c b/tests/qtest/migration-test.c index 71595a74fd..c1e002087d 100644 --- a/tests/qtest/migration-test.c +++ b/tests/qtest/migration-test.c @@ -1768,7 +1768,7 @@ static void test_migrate_auto_converge(void) g_autofree char *uri =3D g_strdup_printf("unix:%s/migsocket", tmpfs); MigrateStart args =3D {}; QTestState *from, *to; - int64_t remaining, percentage; + int64_t percentage; =20 /* * We want the test to be stable and as fast as possible. @@ -1776,14 +1776,6 @@ static void test_migrate_auto_converge(void) * so we need to decrease a bandwidth. */ const int64_t init_pct =3D 5, inc_pct =3D 50, max_pct =3D 95; - const int64_t max_bandwidth =3D 400000000; /* ~400Mb/s */ - const int64_t downtime_limit =3D 250; /* 250ms */ - /* - * We migrate through unix-socket (> 500Mb/s). - * Thus, expected migration speed ~=3D bandwidth limit (< 500Mb/s). - * So, we can predict expected_threshold - */ - const int64_t expected_threshold =3D max_bandwidth * downtime_limit / = 1000; =20 if (test_migrate_start(&from, &to, uri, &args)) { return; @@ -1818,8 +1810,7 @@ static void test_migrate_auto_converge(void) /* The first percentage of throttling should be equal to init_pct */ g_assert_cmpint(percentage, =3D=3D, init_pct); /* Now, when we tested that throttling works, let it converge */ - migrate_set_parameter_int(from, "downtime-limit", downtime_limit); - migrate_set_parameter_int(from, "max-bandwidth", max_bandwidth); + migrate_ensure_converge(from); =20 /* * Wait for pre-switchover status to check last throttle percentage @@ -1830,11 +1821,6 @@ static void test_migrate_auto_converge(void) /* The final percentage of throttling shouldn't be greater than max_pc= t */ percentage =3D read_migrate_property_int(from, "cpu-throttle-percentag= e"); g_assert_cmpint(percentage, <=3D, max_pct); - - remaining =3D read_ram_property_int(from, "remaining"); - g_assert_cmpint(remaining, <, - (expected_threshold + expected_threshold / 100)); - migrate_continue(from, "pre-switchover"); =20 qtest_qmp_eventwait(to, "RESUME"); @@ -1842,7 +1828,6 @@ static void test_migrate_auto_converge(void) wait_for_serial("dest_serial"); wait_for_migration_complete(from); =20 - test_migrate_end(from, to, true); } =20 --=20 2.32.0 From nobody Sat May 18 17:34:40 2024 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1659015751; cv=none; d=zohomail.com; s=zohoarc; b=GnNDVHOWqL5eqwrKuGO/lFSHF0axmRTGaqaiHeJ3T2+CBdhGxwiq1aA5XJOxbNVAVA7JDy0QcNU1zNVQw4kyUtCr6LOjuQ4kUPQ7rFaDoibx8mHa/xDth5U0Rt5W/+hZDjDKtgNerwvG6ZyVernurUxsof2LORU+jf6myToH7yk= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1659015751; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To; bh=14UIYfB2/OMbLxm+bBhZLUWmXdhqp/2ElI7ee4AQpyY=; b=cEKXNCwqloXYo9cpwuCXWnp2lC8AkhQVYc5B/YI9wKteOxh6TyWBVHRhqgWRwxbLV8oqcL1LipjVHhe8daviy5vNEIbwHE66nMmJt5edPKES1dmd8zJd5ixbtFo8lyN9U6JOsd+tGDtZiIH98L145dcNAD8dUG1k6ZtvukKP1w0= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass header.from= (p=none dis=none) Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1659015751809774.6409236950404; Thu, 28 Jul 2022 06:42:31 -0700 (PDT) Received: from localhost ([::1]:34570 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1oH3mX-0007hj-7u for importer@patchew.org; Thu, 28 Jul 2022 09:42:29 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:34706) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1oH3fj-0002Il-IE for qemu-devel@nongnu.org; Thu, 28 Jul 2022 09:35:39 -0400 Received: from us-smtp-delivery-124.mimecast.com ([170.10.129.124]:47161) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1oH3fh-0003j1-Ur for qemu-devel@nongnu.org; Thu, 28 Jul 2022 09:35:27 -0400 Received: from mail-qt1-f200.google.com (mail-qt1-f200.google.com [209.85.160.200]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id us-mta-649-6jJF2AHVMlGr-yPT8SMIoA-1; Thu, 28 Jul 2022 09:35:23 -0400 Received: by mail-qt1-f200.google.com with SMTP id u2-20020ac80502000000b002f94701339eso1024519qtg.13 for ; Thu, 28 Jul 2022 06:35:23 -0700 (PDT) Received: from localhost.localdomain (bras-base-aurron9127w-grc-35-70-27-3-10.dsl.bell.ca. [70.27.3.10]) by smtp.gmail.com with ESMTPSA id x10-20020a05620a448a00b006b618e006ffsm553876qkp.2.2022.07.28.06.35.20 (version=TLS1_3 cipher=TLS_CHACHA20_POLY1305_SHA256 bits=256/256); Thu, 28 Jul 2022 06:35:21 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1659015325; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=14UIYfB2/OMbLxm+bBhZLUWmXdhqp/2ElI7ee4AQpyY=; b=FmrEot67G96J2HHLFKhkBIK5Y9rZXFVmlZMeDLuYVj0fxxVmTFhvJYBby71VvZRymE7wgT dMcMwFj6a793ySv3Q5aXeE1DRBz+tQSE3Bg/GS3XpaZtAHNegm1jDEd1RcEDf2wd0jsMVw pFJlEqu9O8XLJUOWqBJc08mwWCvsNhU= X-MC-Unique: 6jJF2AHVMlGr-yPT8SMIoA-1 X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=14UIYfB2/OMbLxm+bBhZLUWmXdhqp/2ElI7ee4AQpyY=; b=QfQsLV84MoyvwN8N8/udXOzJV8XA+sIpPyj+QH9xGL0AxJ3QRzlmEABwpQB7Qw+JZK o+lRIomZmTvyRXkiESftpMTm2neIwYu1esGL3qz1afSAyKLD6WI4VX8AhVnauNjtml9I efxvwRaHy7nuZCX9gm3cHBFL+D1L4YYef6ygGtbEqDgrd07hoc9g7KampeTgx2G9bYeu 9ouoG8cnFRv+U7azoUUz+W+PqeC/10kFDq2IXB+zpGdgtN+DxNivjEJgz0zGTxxcAAEc VWUlApu1bw+w7FMLfxQn8/bXAUxPhoeC8HwQzw2JXaEQlnW1eVCX210XZnv7jv06x9zX rpSA== X-Gm-Message-State: AJIora+T0i6XmniBYoowKg35OLgFgPR9goJGkiuqAFlghTJDN2Rdk7H4 XQxXvIwHwtKFtzykHnnZnuFAbzWLtfrriZW/Ox+iA2yxq7qtXYnh9umfGr/Axfss7hC8+LeJTqB m21mQJiB8Tin78O/wgRpeaoTnOYQCiofNvjv5LOcTrxF+I0ZDND6tq+tkYKwFN0cV X-Received: by 2002:a05:622a:155:b0:31e:e331:71cc with SMTP id v21-20020a05622a015500b0031ee33171ccmr22667703qtw.254.1659015322073; Thu, 28 Jul 2022 06:35:22 -0700 (PDT) X-Google-Smtp-Source: AGRyM1uhQwELOGNSFAIkBe7mIypXUVjcILKXOeyFgTbitvTHfme0PyWoUcO4dsy2OCsPG2WYbKZDkQ== X-Received: by 2002:a05:622a:155:b0:31e:e331:71cc with SMTP id v21-20020a05622a015500b0031ee33171ccmr22667672qtw.254.1659015321749; Thu, 28 Jul 2022 06:35:21 -0700 (PDT) From: Peter Xu To: qemu-devel@nongnu.org Cc: Thomas Huth , "Dr . David Alan Gilbert" , peterx@redhat.com, Leonardo Bras Soares Passos , Juan Quintela , "Daniel P . Berrange" Subject: [PATCH v3 2/2] migration-test: Allow test to run without uffd Date: Thu, 28 Jul 2022 09:35:16 -0400 Message-Id: <20220728133516.92061-3-peterx@redhat.com> X-Mailer: git-send-email 2.32.0 In-Reply-To: <20220728133516.92061-1-peterx@redhat.com> References: <20220728133516.92061-1-peterx@redhat.com> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Received-SPF: pass client-ip=170.10.129.124; envelope-from=peterx@redhat.com; helo=us-smtp-delivery-124.mimecast.com X-Spam_score_int: -28 X-Spam_score: -2.9 X-Spam_bar: -- X-Spam_report: (-2.9 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-0.082, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_LOW=-0.7, SPF_HELO_NONE=0.001, SPF_PASS=-0.001, T_SCC_BODY_TEXT_LINE=-0.01 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: pass (identity @redhat.com) X-ZM-MESSAGEID: 1659015753155100001 Content-Type: text/plain; charset="utf-8" We used to stop running all tests if uffd is not detected. However logically that's only needed for postcopy not the rest of tests. Keep running the rest when still possible. Reviewed-by: Daniel P. Berrange Signed-off-by: Peter Xu Tested-by: Thomas Huth --- tests/qtest/migration-test.c | 48 +++++++++++++++++++----------------- 1 file changed, 25 insertions(+), 23 deletions(-) diff --git a/tests/qtest/migration-test.c b/tests/qtest/migration-test.c index c1e002087d..10ab7a708c 100644 --- a/tests/qtest/migration-test.c +++ b/tests/qtest/migration-test.c @@ -2424,14 +2424,11 @@ int main(int argc, char **argv) { char template[] =3D "/tmp/migration-test-XXXXXX"; const bool has_kvm =3D qtest_has_accel("kvm"); + const bool has_uffd =3D ufd_version_check(); int ret; =20 g_test_init(&argc, &argv, NULL); =20 - if (!ufd_version_check()) { - return g_test_run(); - } - /* * On ppc64, the test only works with kvm-hv, but not with kvm-pr and = TCG * is touchy due to race conditions on dirty bits (especially on PPC f= or @@ -2460,13 +2457,15 @@ int main(int argc, char **argv) =20 module_call_init(MODULE_INIT_QOM); =20 - qtest_add_func("/migration/postcopy/unix", test_postcopy); - qtest_add_func("/migration/postcopy/plain", test_postcopy); - qtest_add_func("/migration/postcopy/recovery/plain", - test_postcopy_recovery); - qtest_add_func("/migration/postcopy/preempt/plain", test_postcopy_pree= mpt); - qtest_add_func("/migration/postcopy/preempt/recovery/plain", - test_postcopy_preempt_recovery); + if (has_uffd) { + qtest_add_func("/migration/postcopy/unix", test_postcopy); + qtest_add_func("/migration/postcopy/plain", test_postcopy); + qtest_add_func("/migration/postcopy/recovery/plain", + test_postcopy_recovery); + qtest_add_func("/migration/postcopy/preempt/plain", test_postcopy_= preempt); + qtest_add_func("/migration/postcopy/preempt/recovery/plain", + test_postcopy_preempt_recovery); + } =20 qtest_add_func("/migration/bad_dest", test_baddest); qtest_add_func("/migration/precopy/unix/plain", test_precopy_unix_plai= n); @@ -2474,18 +2473,21 @@ int main(int argc, char **argv) #ifdef CONFIG_GNUTLS qtest_add_func("/migration/precopy/unix/tls/psk", test_precopy_unix_tls_psk); - /* - * NOTE: psk test is enough for postcopy, as other types of TLS - * channels are tested under precopy. Here what we want to test is the - * general postcopy path that has TLS channel enabled. - */ - qtest_add_func("/migration/postcopy/tls/psk", test_postcopy_tls_psk); - qtest_add_func("/migration/postcopy/recovery/tls/psk", - test_postcopy_recovery_tls_psk); - qtest_add_func("/migration/postcopy/preempt/tls/psk", - test_postcopy_preempt_tls_psk); - qtest_add_func("/migration/postcopy/preempt/recovery/tls/psk", - test_postcopy_preempt_all); + + if (has_uffd) { + /* + * NOTE: psk test is enough for postcopy, as other types of TLS + * channels are tested under precopy. Here what we want to test i= s the + * general postcopy path that has TLS channel enabled. + */ + qtest_add_func("/migration/postcopy/tls/psk", test_postcopy_tls_ps= k); + qtest_add_func("/migration/postcopy/recovery/tls/psk", + test_postcopy_recovery_tls_psk); + qtest_add_func("/migration/postcopy/preempt/tls/psk", + test_postcopy_preempt_tls_psk); + qtest_add_func("/migration/postcopy/preempt/recovery/tls/psk", + test_postcopy_preempt_all); + } #ifdef CONFIG_TASN1 qtest_add_func("/migration/precopy/unix/tls/x509/default-host", test_precopy_unix_tls_x509_default_host); --=20 2.32.0