From nobody Mon Feb 9 11:06:25 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=quarantine dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1768405093; cv=none; d=zohomail.com; s=zohoarc; b=lRcfjWpdLGkhm7BhHts7iepkpCfbOMWZb89M7Iwpw7HklIFgikM56ucsjblrYnYSA7dzZhWcFjXVXVTXB79A0iybliDwTMQv5hGbWHM6TBiEzVCU9hhPrUm3d4gcdEVAbKMv0VddoneKY+0vs+32vKCVoSNE68BDgr180XdLDys= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1768405093; h=Content-Transfer-Encoding:Cc:Cc:Date:Date:From:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:Subject:To:To:Message-Id:Reply-To; bh=2cTCE74I1jPtrc4NfTcCULcOjF2BScqMVYRyLtvEFyM=; b=FtF0pl0p7JZCr7ShvSUSG/l0kIzsA5+gYrjjSL+ovK1sUpD7tcaNq7pSmAFELi2Sn2QrGNZbn6EcioNZVpLhw1Sj6is3qA0+ZrWYg+Tr4DR5ENN46mKiDfu6F2PjuBk2S+0xzyLBiR+4zK5M5w+fFX97DeskBQT+so5On6wwx84= 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=quarantine dis=none) Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1768405093911319.3397674338406; Wed, 14 Jan 2026 07:38:13 -0800 (PST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1vg2wd-000816-MM; Wed, 14 Jan 2026 10:38:03 -0500 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 1vg2wb-00080E-V3 for qemu-devel@nongnu.org; Wed, 14 Jan 2026 10:38:02 -0500 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 1vg2wa-000411-7H for qemu-devel@nongnu.org; Wed, 14 Jan 2026 10:38:01 -0500 Received: from mail-qk1-f200.google.com (mail-qk1-f200.google.com [209.85.222.200]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-65-Ech_W5khNzGecB3Yrtqcrw-1; Wed, 14 Jan 2026 10:37:58 -0500 Received: by mail-qk1-f200.google.com with SMTP id af79cd13be357-8c52fd4cca2so249974485a.3 for ; Wed, 14 Jan 2026 07:37:58 -0800 (PST) Received: from x1.com ([142.188.210.156]) by smtp.gmail.com with ESMTPSA id af79cd13be357-8c530aab8f1sm184047185a.23.2026.01.14.07.37.56 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 14 Jan 2026 07:37:56 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1768405079; 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=2cTCE74I1jPtrc4NfTcCULcOjF2BScqMVYRyLtvEFyM=; b=RGrtiRwKBZy+NvRzE7CMLrZrD5SC0iLSvL33Lag+nGMOEyDb+tZD+xGgunWMtU8qf5oPAc vRehbcme6I4jP7bBQEd3XvSmyQOChU8Ob/PCJoj78XnVmHj7/0T7DeeUcEJdlKJ2TXQ9LX 893BKGHkFmzxUbLTwKCpDQFA0ZLcZLM= X-MC-Unique: Ech_W5khNzGecB3Yrtqcrw-1 X-Mimecast-MFC-AGG-ID: Ech_W5khNzGecB3Yrtqcrw_1768405078 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=google; t=1768405077; x=1769009877; darn=nongnu.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=2cTCE74I1jPtrc4NfTcCULcOjF2BScqMVYRyLtvEFyM=; b=DZUOyNJiiZkJKUyJRzNVE6eE/wyUaXXh3jOU+F6rtI9xTc5tYrOqsjQh/aUQmkZtvx Eg5SvK9e6lkgCZL6+kWq1pUFrh303n7/MFm6xeGy0fcIReoksW/19nrHaxWuNqZiOuyn hi1h8bqntThNfxQHB60SlZ2exaETIbkNxYYsFy8fcjatPFvT4/ZQ9Eioo8e3F3n6grL5 VJmmcXRwOABCzpFjOOTVohkke0yXLAEkzDHJjVKjqkpdS20+48yWmp1ekQa6exsC2X4P vO3LFbiJoW5yM55p+RAd2PCFr0REHF0LEhEUNfVSEFo2H4XV3FCXRLH1EvxF5updzb1S 18Sg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1768405077; x=1769009877; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-gg:x-gm-message-state:from :to:cc:subject:date:message-id:reply-to; bh=2cTCE74I1jPtrc4NfTcCULcOjF2BScqMVYRyLtvEFyM=; b=vIUN0v+jF3Yc4I/xrLxxHhzYfAuKRuo6CNIcIdjRpDo+X7nJmCxhqSrWViNQdM2AE0 wWX2Mjd46kho4W8ZcmHdML11a7icH+tKGnhqRC0sRYclHbQf6i5H0Ar9Prpd6RNikSrM eLHODnz2x9ySJWATBqyCRUI1yTyzjJTeHDEEshvXLBrlxtqBtdAsGVv+HpQHV0ZhKL4Z A6niVvsbFGNOnlebFNroy9fT8WIpxoNdPNZhiYQJSJN7m8bX+1ZUx8PZ8t8deZmAtJGY Td/SgaivDmruPAm374nrH8/YqhRwnMIILa/MNcKnfUQuxKo0ny6SJyA6kN8HIZtwc+aL J/6A== X-Gm-Message-State: AOJu0YxGVDQix6+tFqqKkfeIjeDeHAkzjy/SjA4FZup2xDzHtaagAC3f D+7aP5ZuvSW/C2/PWz0xFEI8RiXmG+u5DYgFuuPk0U4YKBCzEsBvi+qqMRJPoac3mKHL5w+fKtv c5HDubIcvoLFCdZyZN5mzPtKcEOm7Gl/D0pzZ/mQ3NG0Se9s4g9BnjAJ8fvGUasNXt5l4AeRbFv D42W/O2I9mInmgcON1znJpHaXjUc0vPzvRCKm7VQ== X-Gm-Gg: AY/fxX7nhV02LuknjiuQz+A4Z3DjpT2P7E4xo4hMU/Pw/C7FZR6ZCL4YCOhs/EIqY9W t3kWAZVeyayJrQik2ctLVZksYyYApAOQ0XYKFQTs0r6fUsbtlZmQxYLo0Nu/FBdDb7Prp41xUy0 SGu4iTmL1LCN3G0iCesBYCDpaMeQu3wzjcuPamDhi67xcWJi2LumaCRSGYPnUQEkeY+EGdrEN63 x7jFJow2gd+1e1QE2zta+M0O0i0vSjeGYc59uQLUdRTEKLt1haZTeSm1fJZcc5speKTGMe71+d1 MG+T/Nz3HrTkKjKwj+dTY3922lp1IHRH7lgD1trQRQQwUwEKrj/KCXxzg+uuU4YMVYB3dhrWUMp 0 X-Received: by 2002:a05:620a:25d0:b0:8b2:f182:6941 with SMTP id af79cd13be357-8c52fbcf01emr363669385a.57.1768405077458; Wed, 14 Jan 2026 07:37:57 -0800 (PST) X-Received: by 2002:a05:620a:25d0:b0:8b2:f182:6941 with SMTP id af79cd13be357-8c52fbcf01emr363665085a.57.1768405076938; Wed, 14 Jan 2026 07:37:56 -0800 (PST) From: Peter Xu To: qemu-devel@nongnu.org Cc: Lukas Straub , Fabiano Rosas , Juraj Marcin , peterx@redhat.com, Prasad Pandit Subject: [PATCH v2 2/2] tests/migration-test: Remove postcopy_recovery_fail_stage from MigrateCommon Date: Wed, 14 Jan 2026 10:37:51 -0500 Message-ID: <20260114153751.2427172-3-peterx@redhat.com> X-Mailer: git-send-email 2.50.1 In-Reply-To: <20260114153751.2427172-1-peterx@redhat.com> References: <20260114153751.2427172-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 (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: -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, RCVD_IN_MSPIKE_H2=0.001, RCVD_IN_VALIDITY_RPBL_BLOCKED=0.001, RCVD_IN_VALIDITY_SAFE_BLOCKED=0.001, SPF_HELO_PASS=-0.001, SPF_PASS=-0.001 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: qemu development 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: 1768405095930158500 Content-Type: text/plain; charset="utf-8" The parameter can be instead passed into the function to avoid polluting the global address space of MigrateCommon. Reviewed-by: Prasad Pandit Signed-off-by: Peter Xu --- tests/qtest/migration/framework.h | 6 ++---- tests/qtest/migration/framework.c | 7 ++++--- tests/qtest/migration/postcopy-tests.c | 12 ++++-------- tests/qtest/migration/tls-tests.c | 8 ++++---- 4 files changed, 14 insertions(+), 19 deletions(-) diff --git a/tests/qtest/migration/framework.h b/tests/qtest/migration/fram= ework.h index 0d39bb0d3c..bc6cf6040f 100644 --- a/tests/qtest/migration/framework.h +++ b/tests/qtest/migration/framework.h @@ -228,9 +228,6 @@ typedef struct { * refer to existing ones with live=3Dtrue), or use live=3Doff by defa= ult. */ bool live; - - /* Postcopy specific fields */ - PostcopyRecoveryFailStage postcopy_recovery_fail_stage; } MigrateCommon; =20 void wait_for_serial(const char *side); @@ -243,7 +240,8 @@ int migrate_start(QTestState **from, QTestState **to, c= onst char *uri, void migrate_end(QTestState *from, QTestState *to, bool test_dest); =20 void test_postcopy_common(MigrateCommon *args); -void test_postcopy_recovery_common(MigrateCommon *args); +void test_postcopy_recovery_common(MigrateCommon *args, + PostcopyRecoveryFailStage fail_stage); int test_precopy_common(MigrateCommon *args); void test_file_common(MigrateCommon *args, bool stop_src); void *migrate_hook_start_precopy_tcp_multifd_common(QTestState *from, diff --git a/tests/qtest/migration/framework.c b/tests/qtest/migration/fram= ework.c index 4f46cf8629..d7a5ae56f9 100644 --- a/tests/qtest/migration/framework.c +++ b/tests/qtest/migration/framework.c @@ -739,7 +739,8 @@ static void postcopy_recover_fail(QTestState *from, QTe= stState *to, #endif } =20 -void test_postcopy_recovery_common(MigrateCommon *args) +void test_postcopy_recovery_common(MigrateCommon *args, + PostcopyRecoveryFailStage fail_stage) { QTestState *from, *to; g_autofree char *uri =3D NULL; @@ -784,12 +785,12 @@ void test_postcopy_recovery_common(MigrateCommon *arg= s) wait_for_postcopy_status(to, "postcopy-paused"); wait_for_postcopy_status(from, "postcopy-paused"); =20 - if (args->postcopy_recovery_fail_stage) { + if (fail_stage) { /* * Test when a wrong socket specified for recover, and then the * ability to kick it out, and continue with a correct socket. */ - postcopy_recover_fail(from, to, args->postcopy_recovery_fail_stage= ); + postcopy_recover_fail(from, to, fail_stage); /* continue with a good recovery */ } =20 diff --git a/tests/qtest/migration/postcopy-tests.c b/tests/qtest/migration= /postcopy-tests.c index 7ae4d765d7..13a5759655 100644 --- a/tests/qtest/migration/postcopy-tests.c +++ b/tests/qtest/migration/postcopy-tests.c @@ -41,30 +41,26 @@ static void test_postcopy_preempt(char *name, MigrateCo= mmon *args) =20 static void test_postcopy_recovery(char *name, MigrateCommon *args) { - test_postcopy_recovery_common(args); + test_postcopy_recovery_common(args, POSTCOPY_FAIL_NONE); } =20 static void test_postcopy_recovery_fail_handshake(char *name, MigrateCommon *args) { - args->postcopy_recovery_fail_stage =3D POSTCOPY_FAIL_RECOVERY; - - test_postcopy_recovery_common(args); + test_postcopy_recovery_common(args, POSTCOPY_FAIL_RECOVERY); } =20 static void test_postcopy_recovery_fail_reconnect(char *name, MigrateCommon *args) { - args->postcopy_recovery_fail_stage =3D POSTCOPY_FAIL_CHANNEL_ESTABLISH; - - test_postcopy_recovery_common(args); + test_postcopy_recovery_common(args, POSTCOPY_FAIL_CHANNEL_ESTABLISH); } =20 static void test_postcopy_preempt_recovery(char *name, MigrateCommon *args) { args->start.caps[MIGRATION_CAPABILITY_POSTCOPY_PREEMPT] =3D true; =20 - test_postcopy_recovery_common(args); + test_postcopy_recovery_common(args, POSTCOPY_FAIL_NONE); } =20 static void migration_test_add_postcopy_smoke(MigrationTestEnv *env) diff --git a/tests/qtest/migration/tls-tests.c b/tests/qtest/migration/tls-= tests.c index 6a20c65104..bf0bb06a29 100644 --- a/tests/qtest/migration/tls-tests.c +++ b/tests/qtest/migration/tls-tests.c @@ -385,7 +385,7 @@ static void test_postcopy_recovery_tls_psk(char *name, = MigrateCommon *args) args->start_hook =3D migrate_hook_start_tls_psk_match; args->end_hook =3D migrate_hook_end_tls_psk; =20 - test_postcopy_recovery_common(args); + test_postcopy_recovery_common(args, POSTCOPY_FAIL_NONE); } =20 static void test_multifd_postcopy_recovery_tls_psk(char *name, @@ -396,7 +396,7 @@ static void test_multifd_postcopy_recovery_tls_psk(char= *name, =20 args->start.caps[MIGRATION_CAPABILITY_MULTIFD] =3D true; =20 - test_postcopy_recovery_common(args); + test_postcopy_recovery_common(args, POSTCOPY_FAIL_NONE); } =20 /* This contains preempt+recovery+tls test altogether */ @@ -407,7 +407,7 @@ static void test_postcopy_preempt_all(char *name, Migra= teCommon *args) =20 args->start.caps[MIGRATION_CAPABILITY_POSTCOPY_PREEMPT] =3D true; =20 - test_postcopy_recovery_common(args); + test_postcopy_recovery_common(args, POSTCOPY_FAIL_NONE); } =20 static void test_multifd_postcopy_preempt_recovery_tls_psk(char *name, @@ -419,7 +419,7 @@ static void test_multifd_postcopy_preempt_recovery_tls_= psk(char *name, args->start.caps[MIGRATION_CAPABILITY_MULTIFD] =3D true; args->start.caps[MIGRATION_CAPABILITY_POSTCOPY_PREEMPT] =3D true; =20 - test_postcopy_recovery_common(args); + test_postcopy_recovery_common(args, POSTCOPY_FAIL_NONE); } =20 static void test_precopy_unix_tls_psk(char *name, MigrateCommon *args) --=20 2.50.1