From nobody Wed Feb 11 05:37:02 2026 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=1686264905; cv=none; d=zohomail.com; s=zohoarc; b=QZfVXDbc2JL7AvADiJgMmR7nB24J6KFkiZxBLWJ8TIIOeS4KWJHRWJkpxcq1HxNP58SDGqmdwynywCTzNH4nfmK9GEW/qabcB5oeRmMGlROQlF41tPNTA+bxueHi8350qe4YqW+7M1Cq6HqBexTYbG07liCIElmiq6b/E4UL5ro= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1686264905; h=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=mpEvVBq2rfOxvqUgNbmLvLl3T1SYn/PCj6M245deZac=; b=L0i3fYWFtlrbwnMF+Q2LG2dKMoGN+w9sv7sPEdXUgTP2uldKmDa+Mwejbr5U+GZSHHOfiC2bb13dzAm/RSp+JUNi52Pu4okcjvMI4Jfm4gVrYaepCuuUxARl9pNiyiqZgw+MARY5/HX23U7LssTo+ra3Gj1kGif3e5jDMFJRoDs= 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 1686264905285287.34952388552097; Thu, 8 Jun 2023 15:55:05 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1q7OSQ-0003Wt-Kr; Thu, 08 Jun 2023 18:50:18 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1q7OSP-0003Wd-59 for qemu-devel@nongnu.org; Thu, 08 Jun 2023 18:50:17 -0400 Received: from us-smtp-delivery-124.mimecast.com ([170.10.129.124]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1q7OSN-0004zT-Ef for qemu-devel@nongnu.org; Thu, 08 Jun 2023 18:50:16 -0400 Received: from mimecast-mx02.redhat.com (mx3-rdu2.redhat.com [66.187.233.73]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id us-mta-29-3jA7wHeMP0G3Ij7hccGPEg-1; Thu, 08 Jun 2023 18:50:11 -0400 Received: from smtp.corp.redhat.com (int-mx09.intmail.prod.int.rdu2.redhat.com [10.11.54.9]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx02.redhat.com (Postfix) with ESMTPS id 2DE742A59549; Thu, 8 Jun 2023 22:50:11 +0000 (UTC) Received: from secure.mitica (unknown [10.39.192.3]) by smtp.corp.redhat.com (Postfix) with ESMTP id A3B5E515541; Thu, 8 Jun 2023 22:50:09 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1686264614; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=mpEvVBq2rfOxvqUgNbmLvLl3T1SYn/PCj6M245deZac=; b=FnATdLRqePciy42Y0kEFQDw0DFkD9ZKMR7Rwyw2CnCEn1uG6KJkISf9caL2jG4pLZOPXCa VAE2R5ulrSeI8b6y3NuQzHH3sTKcQa7qxxGU7tApihMRA30KMZdAyXU6iXNY8I6klvrqKV BAUe+tMZy/ASAvXk6MagvRkSCnfS/5E= X-MC-Unique: 3jA7wHeMP0G3Ij7hccGPEg-1 From: Juan Quintela To: qemu-devel@nongnu.org Cc: Paolo Bonzini , Laurent Vivier , Thomas Huth , Peter Xu , Peter Maydell , Juan Quintela , =?UTF-8?q?Daniel=20P=20=2E=20Berrang=C3=A9?= , Leonardo Bras Subject: [PATCH 13/42] migration-test: Check for shared memory like for everything else Date: Fri, 9 Jun 2023 00:49:14 +0200 Message-Id: <20230608224943.3877-14-quintela@redhat.com> In-Reply-To: <20230608224943.3877-1-quintela@redhat.com> References: <20230608224943.3877-1-quintela@redhat.com> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable X-Scanned-By: MIMEDefang 3.1 on 10.11.54.9 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=quintela@redhat.com; helo=us-smtp-delivery-124.mimecast.com X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-0.001, 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-bounces+importer=patchew.org@nongnu.org X-ZohoMail-DKIM: pass (identity @redhat.com) X-ZM-MESSAGEID: 1686264906133100001 Content-Type: text/plain; charset="utf-8" Makes things easier and cleaner. Signed-off-by: Juan Quintela Reviewed-by: Peter Xu --- tests/qtest/migration-test.c | 20 ++++++++++++-------- 1 file changed, 12 insertions(+), 8 deletions(-) diff --git a/tests/qtest/migration-test.c b/tests/qtest/migration-test.c index daaf5cd71a..5837060138 100644 --- a/tests/qtest/migration-test.c +++ b/tests/qtest/migration-test.c @@ -645,13 +645,6 @@ static int test_migrate_start(QTestState **from, QTest= State **to, const char *arch =3D qtest_get_arch(); const char *memory_size; =20 - if (args->use_shmem) { - if (!g_file_test("/dev/shm", G_FILE_TEST_IS_DIR)) { - g_test_skip("/dev/shm is not supported"); - return -1; - } - } - got_src_stop =3D false; got_dst_resume =3D false; if (strcmp(arch, "i386") =3D=3D 0 || strcmp(arch, "x86_64") =3D=3D 0) { @@ -2639,6 +2632,15 @@ static bool kvm_dirty_ring_supported(void) #endif } =20 +static bool shm_supported(void) +{ + if (g_file_test("/dev/shm", G_FILE_TEST_IS_DIR)) { + return true; + } + g_test_message("Skipping test: shared memory not available"); + return false; +} + int main(int argc, char **argv) { bool has_kvm, has_tcg; @@ -2768,7 +2770,9 @@ int main(int argc, char **argv) #endif /* CONFIG_TASN1 */ #endif /* CONFIG_GNUTLS */ =20 - qtest_add_func("/migration/ignore_shared", test_ignore_shared); + if (shm_supported()) { + qtest_add_func("/migration/ignore_shared", test_ignore_shared); + } #ifndef _WIN32 qtest_add_func("/migration/fd_proto", test_migrate_fd_proto); #endif --=20 2.40.1