From nobody Tue May 26 12:01:12 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=suse.de ARC-Seal: i=1; a=rsa-sha256; t=1777997467; cv=none; d=zohomail.com; s=zohoarc; b=K6wlDsgGY1uOx9v06q052ayLy7Vud55kg26mIsbIyoJGcorogzko6QeepmmLxmMW3gFoqtwiD510mTMMMq0laJH0zqXllBePJcOWlk8cwf0Obt2lS6nAhhBxhk1pKiDvC90vETsZnAdZNaxP1QDBnjLkRcB6b6QI7m3/+S+vDLc= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1777997467; 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=j+tsdWsqYD+15JXRDE2F+ieq7bq30O01GxrwVF0GSkI=; b=Oqu2PdBbUST/BM61ki4ogZ8nDFEOeaqMYwbtwPRzBAn91B1Fz5ULNFwSMJfLJgyNfhDeReuSRaF+/tlFKv4YpW6i5rAAM9YzURzv4hBhhhev3UwCsQVjhdBKS/2BJ1CPM0rQ/cVOyMrK+qHEAF0w0aH8S8L6Xo3v2hZ3MWmCpaU= 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 lists1p.gnu.org (lists1p.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 177799746781986.16433116086603; Tue, 5 May 2026 09:11:07 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists1p.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1wKIM2-0008Ip-38; Tue, 05 May 2026 12:10:38 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists1p.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1wKILC-0007w4-Mt for qemu-devel@nongnu.org; Tue, 05 May 2026 12:09:47 -0400 Received: from smtp-out1.suse.de ([195.135.223.130]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1wKIL9-0007RJ-8e for qemu-devel@nongnu.org; Tue, 05 May 2026 12:09:46 -0400 Received: from imap1.dmz-prg2.suse.org (unknown [10.150.64.97]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by smtp-out1.suse.de (Postfix) with ESMTPS id 884ED6B75F; Tue, 5 May 2026 16:09:24 +0000 (UTC) Received: from imap1.dmz-prg2.suse.org (localhost [127.0.0.1]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by imap1.dmz-prg2.suse.org (Postfix) with ESMTPS id 09489593A3; Tue, 5 May 2026 16:09:22 +0000 (UTC) Received: from dovecot-director2.suse.de ([2a07:de40:b281:106:10:150:64:167]) by imap1.dmz-prg2.suse.org with ESMTPSA id 4LKyMjIW+mmNcgAAD6G6ig (envelope-from ); Tue, 05 May 2026 16:09:22 +0000 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=suse.de; s=susede2_rsa; t=1777997364; h=from:from:reply-to: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=j+tsdWsqYD+15JXRDE2F+ieq7bq30O01GxrwVF0GSkI=; b=GGDlS1y5r0aYMCh9p2Pg77suxS5OVBfH1HS4c/g4Vwejg3UTdwCj+H4KaylEGwaZG+hmLx vs4u9O8oe2o9R/AiVLk+gOUSileViakUNK0/MBEd0tHMgVpw0kP+on6qVkTqNujmc6UK3q 159opHCLFFm1stimpvIFDju/+3/3E7U= DKIM-Signature: v=1; a=ed25519-sha256; c=relaxed/relaxed; d=suse.de; s=susede2_ed25519; t=1777997364; h=from:from:reply-to: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=j+tsdWsqYD+15JXRDE2F+ieq7bq30O01GxrwVF0GSkI=; b=dBhH98HRaOpUQ3NGzO8Du3Z7UsuvKG6lLi24muv7N6Li6gHUIlsuUSiYk4gtySYAfOncm1 2EjPRE0jSKHTvwAA== Authentication-Results: smtp-out1.suse.de; none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=suse.de; s=susede2_rsa; t=1777997364; h=from:from:reply-to: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=j+tsdWsqYD+15JXRDE2F+ieq7bq30O01GxrwVF0GSkI=; b=GGDlS1y5r0aYMCh9p2Pg77suxS5OVBfH1HS4c/g4Vwejg3UTdwCj+H4KaylEGwaZG+hmLx vs4u9O8oe2o9R/AiVLk+gOUSileViakUNK0/MBEd0tHMgVpw0kP+on6qVkTqNujmc6UK3q 159opHCLFFm1stimpvIFDju/+3/3E7U= DKIM-Signature: v=1; a=ed25519-sha256; c=relaxed/relaxed; d=suse.de; s=susede2_ed25519; t=1777997364; h=from:from:reply-to: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=j+tsdWsqYD+15JXRDE2F+ieq7bq30O01GxrwVF0GSkI=; b=dBhH98HRaOpUQ3NGzO8Du3Z7UsuvKG6lLi24muv7N6Li6gHUIlsuUSiYk4gtySYAfOncm1 2EjPRE0jSKHTvwAA== From: Fabiano Rosas To: qemu-devel@nongnu.org Cc: Peter Xu , Mark Kanda , Ben Chaney , Laurent Vivier , Paolo Bonzini Subject: [PATCH v1 01/15] tests/qtest/migration: Move cpr transfer logic into cpr-tests.c Date: Tue, 5 May 2026 13:09:00 -0300 Message-ID: <20260505160915.25558-2-farosas@suse.de> X-Mailer: git-send-email 2.51.0 In-Reply-To: <20260505160915.25558-1-farosas@suse.de> References: <20260505160915.25558-1-farosas@suse.de> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable X-Spamd-Result: default: False [-2.80 / 50.00]; BAYES_HAM(-3.00)[100.00%]; NEURAL_HAM_LONG(-1.00)[-1.000]; MID_CONTAINS_FROM(1.00)[]; R_MISSING_CHARSET(0.50)[]; NEURAL_HAM_SHORT(-0.20)[-1.000]; MIME_GOOD(-0.10)[text/plain]; TO_MATCH_ENVRCPT_ALL(0.00)[]; FROM_HAS_DN(0.00)[]; ARC_NA(0.00)[]; MIME_TRACE(0.00)[0:+]; TO_DN_SOME(0.00)[]; DBL_BLOCKED_OPENRESOLVER(0.00)[imap1.dmz-prg2.suse.org:helo,suse.de:mid,suse.de:email]; RCVD_VIA_SMTP_AUTH(0.00)[]; FROM_EQ_ENVFROM(0.00)[]; RCVD_COUNT_TWO(0.00)[2]; FUZZY_RATELIMITED(0.00)[rspamd.com]; DKIM_SIGNED(0.00)[suse.de:s=susede2_rsa,suse.de:s=susede2_ed25519]; RCPT_COUNT_FIVE(0.00)[6]; RCVD_TLS_ALL(0.00)[] X-Spam-Score: -2.80 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=lists1p.gnu.org; Received-SPF: pass client-ip=195.135.223.130; envelope-from=farosas@suse.de; helo=smtp-out1.suse.de X-Spam_score_int: -43 X-Spam_score: -4.4 X-Spam_bar: ---- X-Spam_report: (-4.4 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_MED=-2.3, SPF_HELO_NONE=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 @suse.de) X-ZM-MESSAGEID: 1777997468843158500 Content-Type: text/plain; charset="utf-8" There's some amount of cpr-transfer logic at precopy_common, which in retrospect was a bad idea. For just two tests, that's too much code to be in the common function. Move it to the cpr file. We'll need this cleanup for subsequent improvements. Signed-off-by: Fabiano Rosas Reviewed-by: Peter Xu --- tests/qtest/migration/cpr-tests.c | 57 ++++++++++++++++++++++++++++--- tests/qtest/migration/framework.c | 36 +++---------------- tests/qtest/migration/framework.h | 3 -- 3 files changed, 56 insertions(+), 40 deletions(-) diff --git a/tests/qtest/migration/cpr-tests.c b/tests/qtest/migration/cpr-= tests.c index 63ca5f3996..48c98f0089 100644 --- a/tests/qtest/migration/cpr-tests.c +++ b/tests/qtest/migration/cpr-tests.c @@ -15,6 +15,9 @@ #include "migration/framework.h" #include "migration/migration-qmp.h" #include "migration/migration-util.h" +#include "qapi/error.h" +#include "qobject/qjson.h" +#include "qobject/qlist.h" =20 =20 static char *tmpfs; @@ -42,10 +45,56 @@ static void test_mode_reboot(char *name, MigrateCommon = *args) test_file_common(args, true); } =20 -static void *test_mode_transfer_start(QTestState *from, QTestState *to) +static int test_transfer(MigrateCommon *args, const char *cpr_channel, + bool incoming_defer) { + QTestState *from, *to; + QObject *obj, *out_channels =3D qobject_from_json(args->connect_channe= ls, + &error_abort); + QList *channels_list; + + /* + * The cpr channel must be included in outgoing channels, but not in + * migrate-incoming channels. + */ + channels_list =3D qobject_to(QList, out_channels); + obj =3D migrate_str_to_channel(cpr_channel); + qlist_append(channels_list, obj); + + if (migrate_start(&from, &to, args->listen_uri, &args->start)) { + return -1; + } + migrate_set_parameter_str(from, "mode", "cpr-transfer"); - return NULL; + + wait_for_serial("src_serial"); + + qtest_qmp_assert_success(from, "{ 'execute' : 'stop'}"); + wait_for_stop(from, get_src()); + migrate_ensure_converge(from); + + migrate_qmp(from, to, NULL, out_channels, "{}"); + + qtest_connect(to); + qtest_qmp_handshake(to, NULL); + if (incoming_defer) { + QObject *in_channels =3D qobject_from_json(args->connect_channels, + &error_abort); + + migrate_incoming_qmp(to, NULL, in_channels, "{}"); + } + + wait_for_migration_complete(from); + wait_for_migration_complete(to); + + qtest_qmp_assert_success(to, "{ 'execute' : 'cont'}"); + + wait_for_resume(to, get_dst()); + wait_for_serial("dest_serial"); + + migrate_end(from, to, true); + + return 0; } =20 /* @@ -86,15 +135,13 @@ static void test_mode_transfer_common(MigrateCommon *a= rgs, bool incoming_defer) =20 args->listen_uri =3D incoming_defer ? "defer" : uri; args->connect_channels =3D connect_channels; - args->cpr_channel =3D cpr_channel; - args->start_hook =3D test_mode_transfer_start; =20 args->start.opts_source =3D opts; args->start.opts_target =3D opts_target; args->start.defer_target_connect =3D true; args->start.mem_type =3D MEM_TYPE_MEMFD; =20 - if (test_precopy_common(args) < 0) { + if (test_transfer(args, cpr_channel, incoming_defer) < 0) { close(cpr_sockfd); unlink(cpr_path); } diff --git a/tests/qtest/migration/framework.c b/tests/qtest/migration/fram= ework.c index 9f71d51f1e..4ef5e1de83 100644 --- a/tests/qtest/migration/framework.c +++ b/tests/qtest/migration/framework.c @@ -20,7 +20,6 @@ #include "ppc-util.h" #include "qapi/error.h" #include "qobject/qjson.h" -#include "qobject/qlist.h" #include "qemu/bswap.h" #include "qemu/module.h" #include "qemu/option.h" @@ -833,10 +832,7 @@ int test_precopy_common(MigrateCommon *args) { QTestState *from, *to; void *data_hook =3D NULL; - QObject *in_channels =3D NULL; - QObject *out_channels =3D NULL; - - g_assert(!args->cpr_channel || args->connect_channels); + QObject *channels =3D NULL; =20 if (migrate_start(&from, &to, args->listen_uri, &args->start)) { return -1; @@ -869,40 +865,16 @@ int test_precopy_common(MigrateCommon *args) } } =20 - /* - * The cpr channel must be included in outgoing channels, but not in - * migrate-incoming channels. - */ if (args->connect_channels) { - if (args->start.defer_target_connect && - !strcmp(args->listen_uri, "defer")) { - in_channels =3D qobject_from_json(args->connect_channels, - &error_abort); - } - out_channels =3D qobject_from_json(args->connect_channels, &error_= abort); - - if (args->cpr_channel) { - QList *channels_list =3D qobject_to(QList, out_channels); - QObject *obj =3D migrate_str_to_channel(args->cpr_channel); - - qlist_append(channels_list, obj); - } + channels =3D qobject_from_json(args->connect_channels, &error_abor= t); } =20 if (args->result =3D=3D MIG_TEST_QMP_ERROR) { - migrate_qmp_fail(from, args->connect_uri, out_channels, "{}"); + migrate_qmp_fail(from, args->connect_uri, channels, "{}"); goto finish; } =20 - migrate_qmp(from, to, args->connect_uri, out_channels, "{}"); - - if (args->start.defer_target_connect) { - qtest_connect(to); - qtest_qmp_handshake(to, NULL); - if (!strcmp(args->listen_uri, "defer")) { - migrate_incoming_qmp(to, args->connect_uri, in_channels, "{}"); - } - } + migrate_qmp(from, to, args->connect_uri, channels, "{}"); =20 if (args->result !=3D MIG_TEST_SUCCEED) { bool allow_active =3D args->result =3D=3D MIG_TEST_FAIL; diff --git a/tests/qtest/migration/framework.h b/tests/qtest/migration/fram= ework.h index 79604c60f5..13ce84b49e 100644 --- a/tests/qtest/migration/framework.h +++ b/tests/qtest/migration/framework.h @@ -180,9 +180,6 @@ typedef struct { */ const char *connect_channels; =20 - /* Optional: the cpr migration channel, in JSON or dotted keys format = */ - const char *cpr_channel; - /* Optional: callback to run at start to set migration parameters */ TestMigrateStartHook start_hook; /* Optional: callback to run at finish to cleanup */ --=20 2.51.0 From nobody Tue May 26 12:01:12 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=suse.de ARC-Seal: i=1; a=rsa-sha256; t=1777997467; cv=none; d=zohomail.com; s=zohoarc; b=eFlDqa3+88OJKKHmxDo47ZoCtZ5qtzN9B3aa8b7XVBI6ujb/xlk0uKk4YPnsbLFZGsralohzAyn+q8zTaB2B4ydEJmwfOC3GYu9RXR91y3jPIZQhzVaoemSIhrOdOwvLcFgIHy5f011LgQAmo/BRRk8Dmi5SpyRAtxSO0fIetSM= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1777997467; 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=6X3ByejEazZO/IkJ6RU0S63fNUcklMp24fSVi0bmCsk=; b=FsGRRwVRephWnxQ2HLbSD1FACKMip7pdjaMe10f5lxoM7MWGJFNbV5K2QdpJlCdN5/JW+jtmladLA430GZ695dE5pDCFxe7Ex+mHdToYHRFMy8RdMla4ikNALYUn8dWY44qylwo5iiWt6y9b+hYEn/rgCE+Wb/2ikqe52RZGLio= 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 lists1p.gnu.org (lists1p.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1777997467626319.1276847275832; Tue, 5 May 2026 09:11:07 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists1p.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1wKILT-00086G-4M; Tue, 05 May 2026 12:10:03 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists1p.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1wKIKx-0007oF-FD for qemu-devel@nongnu.org; Tue, 05 May 2026 12:09:36 -0400 Received: from smtp-out2.suse.de ([2a07:de40:b251:101:10:150:64:2]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1wKIKu-0007IC-OS for qemu-devel@nongnu.org; Tue, 05 May 2026 12:09:31 -0400 Received: from imap1.dmz-prg2.suse.org (unknown [10.150.64.97]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by smtp-out2.suse.de (Postfix) with ESMTPS id 75CFF5CAF0; Tue, 5 May 2026 16:09:26 +0000 (UTC) Received: from imap1.dmz-prg2.suse.org (localhost [127.0.0.1]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by imap1.dmz-prg2.suse.org (Postfix) with ESMTPS id EB464593A3; Tue, 5 May 2026 16:09:24 +0000 (UTC) Received: from dovecot-director2.suse.de ([2a07:de40:b281:106:10:150:64:167]) by imap1.dmz-prg2.suse.org with ESMTPSA id OHVHLjQW+mmNcgAAD6G6ig (envelope-from ); Tue, 05 May 2026 16:09:24 +0000 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=suse.de; s=susede2_rsa; t=1777997366; h=from:from:reply-to: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=6X3ByejEazZO/IkJ6RU0S63fNUcklMp24fSVi0bmCsk=; b=vcBZUgYPOU0S4z02ZV02P7FKukVQUv9tjEHwGdabqyA2x4/1xuFlQn19VGaA7BLmnuffUD oXyjtgqfLNDnu+eA6W9C8Ou+AAYpkmWfBpm9uB/+prCYqjxyM6pMjNpIpRtzWx0qOneFGw tcjXtw+XeG24SsUjiZHslDcuT1X3Vvo= DKIM-Signature: v=1; a=ed25519-sha256; c=relaxed/relaxed; d=suse.de; s=susede2_ed25519; t=1777997366; h=from:from:reply-to: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=6X3ByejEazZO/IkJ6RU0S63fNUcklMp24fSVi0bmCsk=; b=ojyGKt2eT1Wi8AASiB0METQsDmIC/jXxI8fPP3C8sb492yfQjdeJ1wOKouUWICC4suZigC 6EEZ9g3C3pHpuCAw== Authentication-Results: smtp-out2.suse.de; none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=suse.de; s=susede2_rsa; t=1777997366; h=from:from:reply-to: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=6X3ByejEazZO/IkJ6RU0S63fNUcklMp24fSVi0bmCsk=; b=vcBZUgYPOU0S4z02ZV02P7FKukVQUv9tjEHwGdabqyA2x4/1xuFlQn19VGaA7BLmnuffUD oXyjtgqfLNDnu+eA6W9C8Ou+AAYpkmWfBpm9uB/+prCYqjxyM6pMjNpIpRtzWx0qOneFGw tcjXtw+XeG24SsUjiZHslDcuT1X3Vvo= DKIM-Signature: v=1; a=ed25519-sha256; c=relaxed/relaxed; d=suse.de; s=susede2_ed25519; t=1777997366; h=from:from:reply-to: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=6X3ByejEazZO/IkJ6RU0S63fNUcklMp24fSVi0bmCsk=; b=ojyGKt2eT1Wi8AASiB0METQsDmIC/jXxI8fPP3C8sb492yfQjdeJ1wOKouUWICC4suZigC 6EEZ9g3C3pHpuCAw== From: Fabiano Rosas To: qemu-devel@nongnu.org Cc: Peter Xu , Mark Kanda , Ben Chaney , Laurent Vivier , Paolo Bonzini Subject: [PATCH v1 02/15] tests/qtest/migration: Make file-tests defer by default Date: Tue, 5 May 2026 13:09:01 -0300 Message-ID: <20260505160915.25558-3-farosas@suse.de> X-Mailer: git-send-email 2.51.0 In-Reply-To: <20260505160915.25558-1-farosas@suse.de> References: <20260505160915.25558-1-farosas@suse.de> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable X-Spam-Score: -2.80 X-Spamd-Result: default: False [-2.80 / 50.00]; BAYES_HAM(-3.00)[100.00%]; NEURAL_HAM_LONG(-1.00)[-1.000]; MID_CONTAINS_FROM(1.00)[]; R_MISSING_CHARSET(0.50)[]; NEURAL_HAM_SHORT(-0.20)[-1.000]; MIME_GOOD(-0.10)[text/plain]; TO_MATCH_ENVRCPT_ALL(0.00)[]; FROM_HAS_DN(0.00)[]; ARC_NA(0.00)[]; MIME_TRACE(0.00)[0:+]; TO_DN_SOME(0.00)[]; DBL_BLOCKED_OPENRESOLVER(0.00)[suse.de:email,suse.de:mid,imap1.dmz-prg2.suse.org:helo]; RCVD_VIA_SMTP_AUTH(0.00)[]; FROM_EQ_ENVFROM(0.00)[]; RCVD_COUNT_TWO(0.00)[2]; FUZZY_RATELIMITED(0.00)[rspamd.com]; DKIM_SIGNED(0.00)[suse.de:s=susede2_rsa,suse.de:s=susede2_ed25519]; RCPT_COUNT_FIVE(0.00)[6]; RCVD_TLS_ALL(0.00)[] 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=lists1p.gnu.org; Received-SPF: pass client-ip=2a07:de40:b251:101:10:150:64:2; envelope-from=farosas@suse.de; helo=smtp-out2.suse.de 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, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, SPF_HELO_NONE=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 @suse.de) X-ZM-MESSAGEID: 1777997470346158500 Content-Type: text/plain; charset="utf-8" All file: tests use listen_uri=3D"defer". Make this the default in the common function. Signed-off-by: Fabiano Rosas Reviewed-by: Peter Xu --- tests/qtest/migration/cpr-tests.c | 1 - tests/qtest/migration/file-tests.c | 14 -------------- tests/qtest/migration/framework.c | 2 +- 3 files changed, 1 insertion(+), 16 deletions(-) diff --git a/tests/qtest/migration/cpr-tests.c b/tests/qtest/migration/cpr-= tests.c index 48c98f0089..18217f0460 100644 --- a/tests/qtest/migration/cpr-tests.c +++ b/tests/qtest/migration/cpr-tests.c @@ -36,7 +36,6 @@ static void test_mode_reboot(char *name, MigrateCommon *a= rgs) FILE_TEST_FILENAME); =20 args->connect_uri =3D uri; - args->listen_uri =3D "defer"; args->start_hook =3D migrate_hook_start_mode_reboot; =20 args->start.mem_type =3D MEM_TYPE_SHMEM; diff --git a/tests/qtest/migration/file-tests.c b/tests/qtest/migration/fil= e-tests.c index fef172068f..75135447f8 100644 --- a/tests/qtest/migration/file-tests.c +++ b/tests/qtest/migration/file-tests.c @@ -70,8 +70,6 @@ static void test_precopy_file(char *name, MigrateCommon *= args) g_autofree char *uri =3D g_strdup_printf("file:%s/%s", tmpfs, FILE_TEST_FILENAME); args->connect_uri =3D uri; - args->listen_uri =3D "defer"; - test_file_common(args, true); } =20 @@ -114,7 +112,6 @@ static void test_precopy_file_offset_fdset(char *name, = MigrateCommon *args) g_autofree char *uri =3D g_strdup_printf("file:/dev/fdset/1,offset=3D%= d", FILE_TEST_OFFSET); args->connect_uri =3D uri; - args->listen_uri =3D "defer"; args->start_hook =3D migrate_hook_start_file_offset_fdset; =20 test_file_common(args, false); @@ -128,8 +125,6 @@ static void test_precopy_file_offset(char *name, Migrat= eCommon *args) FILE_TEST_OFFSET); =20 args->connect_uri =3D uri; - args->listen_uri =3D "defer"; - test_file_common(args, false); } =20 @@ -140,7 +135,6 @@ static void test_precopy_file_offset_bad(char *name, Mi= grateCommon *args) tmpfs, FILE_TEST_FILENAME); =20 args->connect_uri =3D uri; - args->listen_uri =3D "defer"; args->result =3D MIG_TEST_QMP_ERROR; =20 test_file_common(args, false); @@ -152,7 +146,6 @@ static void test_precopy_file_mapped_ram_live(char *nam= e, MigrateCommon *args) FILE_TEST_FILENAME); =20 args->connect_uri =3D uri; - args->listen_uri =3D "defer"; =20 args->start.caps[MIGRATION_CAPABILITY_MAPPED_RAM] =3D true; =20 @@ -165,7 +158,6 @@ static void test_precopy_file_mapped_ram(char *name, Mi= grateCommon *args) FILE_TEST_FILENAME); =20 args->connect_uri =3D uri; - args->listen_uri =3D "defer"; =20 args->start.caps[MIGRATION_CAPABILITY_MAPPED_RAM] =3D true; =20 @@ -177,7 +169,6 @@ static void test_multifd_file_mapped_ram_live(char *nam= e, MigrateCommon *args) g_autofree char *uri =3D g_strdup_printf("file:%s/%s", tmpfs, FILE_TEST_FILENAME); args->connect_uri =3D uri; - args->listen_uri =3D "defer"; =20 args->start.caps[MIGRATION_CAPABILITY_MULTIFD] =3D true; args->start.caps[MIGRATION_CAPABILITY_MAPPED_RAM] =3D true; @@ -191,7 +182,6 @@ static void test_multifd_file_mapped_ram(char *name, Mi= grateCommon *args) FILE_TEST_FILENAME); =20 args->connect_uri =3D uri; - args->listen_uri =3D "defer"; =20 args->start.caps[MIGRATION_CAPABILITY_MULTIFD] =3D true; args->start.caps[MIGRATION_CAPABILITY_MAPPED_RAM] =3D true; @@ -213,7 +203,6 @@ static void test_multifd_file_mapped_ram_dio(char *name= , MigrateCommon *args) g_autofree char *uri =3D g_strdup_printf("file:%s/%s", tmpfs, FILE_TEST_FILENAME); args->connect_uri =3D uri; - args->listen_uri =3D "defer"; args->start_hook =3D migrate_hook_start_multifd_mapped_ram_dio; =20 args->start.caps[MIGRATION_CAPABILITY_MAPPED_RAM] =3D true; @@ -285,7 +274,6 @@ static void test_multifd_file_mapped_ram_fdset(char *na= me, MigrateCommon *args) FILE_TEST_OFFSET); =20 args->connect_uri =3D uri; - args->listen_uri =3D "defer"; args->start_hook =3D migrate_hook_start_multifd_mapped_ram_fdset; args->end_hook =3D migrate_hook_end_multifd_mapped_ram_fdset; =20 @@ -301,7 +289,6 @@ static void test_multifd_file_mapped_ram_fdset_dio(char= *name, g_autofree char *uri =3D g_strdup_printf("file:/dev/fdset/1,offset=3D%= d", FILE_TEST_OFFSET); args->connect_uri =3D uri; - args->listen_uri =3D "defer"; args->start_hook =3D migrate_hook_start_multifd_mapped_ram_fdset_dio; args->end_hook =3D migrate_hook_end_multifd_mapped_ram_fdset; =20 @@ -332,7 +319,6 @@ test_precopy_file_mapped_ram_ignore_shared(char *name, = MigrateCommon *args) g_autofree char *uri =3D g_strdup_printf("file:%s/%s", tmpfs, FILE_TEST_FILENAME); args->connect_uri =3D uri; - args->listen_uri =3D "defer"; =20 args->start.caps[MIGRATION_CAPABILITY_MAPPED_RAM] =3D true; args->start.caps[MIGRATION_CAPABILITY_X_IGNORE_SHARED] =3D true; diff --git a/tests/qtest/migration/framework.c b/tests/qtest/migration/fram= ework.c index 4ef5e1de83..edd3d0b165 100644 --- a/tests/qtest/migration/framework.c +++ b/tests/qtest/migration/framework.c @@ -972,7 +972,7 @@ void test_file_common(MigrateCommon *args, bool stop_sr= c) void *data_hook =3D NULL; bool check_offset =3D false; =20 - if (migrate_start(&from, &to, args->listen_uri, &args->start)) { + if (migrate_start(&from, &to, "defer", &args->start)) { return; } =20 --=20 2.51.0 From nobody Tue May 26 12:01:12 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=suse.de ARC-Seal: i=1; a=rsa-sha256; t=1777997538; cv=none; d=zohomail.com; s=zohoarc; b=k57kr7VBqKIksWsvVh1yn33nGNbgf1A9uAN15ldyMBcHlmhbfY8jyAEAFwW4fzR51WO9Tvp39WmNaT63MLGPn1oISR30zaJiH7aclhaYP8m/rAGkuGmGGMKpx4JsrjmoShDwTkxoNifJ6VeIr5Szc8glOwd5RlmQ47a7Mj99/Eg= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1777997538; 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=ih7EP1hGcdM62oFC55Hb51YORj/ldUEDXIPDlWObwhA=; b=Lc1AQJKgz9YLhy/W8ONvvHI0hlpo+OW5RuMfzaAara5RnxINFdAa0+Z5lZRxzE+pD66/e7ylp3hNSBARcoBytVJq3NDYIf8MaQ/Ztz5J9AOcSz1vqEQieb1ECW+j3xZ3Z5WAbYcldtsIBEg5Po7qb7U2o/XBAD0qWJzDCGElDXs= 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 lists1p.gnu.org (lists1p.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1777997538062971.9479492120201; Tue, 5 May 2026 09:12:18 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists1p.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1wKIM3-0008Pt-V3; Tue, 05 May 2026 12:10:39 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists1p.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1wKILI-00080E-R2 for qemu-devel@nongnu.org; Tue, 05 May 2026 12:09:53 -0400 Received: from smtp-out1.suse.de ([195.135.223.130]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1wKILG-00086L-I9 for qemu-devel@nongnu.org; Tue, 05 May 2026 12:09:51 -0400 Received: from imap1.dmz-prg2.suse.org (unknown [10.150.64.97]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by smtp-out1.suse.de (Postfix) with ESMTPS id 059276B763; Tue, 5 May 2026 16:09:28 +0000 (UTC) Received: from imap1.dmz-prg2.suse.org (localhost [127.0.0.1]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by imap1.dmz-prg2.suse.org (Postfix) with ESMTPS id D6F49593A3; Tue, 5 May 2026 16:09:26 +0000 (UTC) Received: from dovecot-director2.suse.de ([2a07:de40:b281:106:10:150:64:167]) by imap1.dmz-prg2.suse.org with ESMTPSA id iGJfKTYW+mmNcgAAD6G6ig (envelope-from ); Tue, 05 May 2026 16:09:26 +0000 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=suse.de; s=susede2_rsa; t=1777997368; h=from:from:reply-to: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=ih7EP1hGcdM62oFC55Hb51YORj/ldUEDXIPDlWObwhA=; b=DjSRJyc11thmgaRCfBShXIXbYY52q9XxP56zUX8ocUfOWD+mA4Mcv/CEokCuCouyeOrz0P yiHwOpD4psDztGDjarCO0kK5MjOIjAVZ/uwDIFh8bk4dLBiuyYRUbMrPVpZX8BY9VF/Jxn 2ev84Bqu/rhPnAZDKIbr+XDzvCn/Er8= DKIM-Signature: v=1; a=ed25519-sha256; c=relaxed/relaxed; d=suse.de; s=susede2_ed25519; t=1777997368; h=from:from:reply-to: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=ih7EP1hGcdM62oFC55Hb51YORj/ldUEDXIPDlWObwhA=; b=J2tyBysP5BP5xsqKOjN1SXlvYbwVbcK5bxIeyeG+hrgbIpdMu9mJC5QqWT6ElL8tjETuaV +7em3ixod9ram5DA== Authentication-Results: smtp-out1.suse.de; none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=suse.de; s=susede2_rsa; t=1777997368; h=from:from:reply-to: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=ih7EP1hGcdM62oFC55Hb51YORj/ldUEDXIPDlWObwhA=; b=DjSRJyc11thmgaRCfBShXIXbYY52q9XxP56zUX8ocUfOWD+mA4Mcv/CEokCuCouyeOrz0P yiHwOpD4psDztGDjarCO0kK5MjOIjAVZ/uwDIFh8bk4dLBiuyYRUbMrPVpZX8BY9VF/Jxn 2ev84Bqu/rhPnAZDKIbr+XDzvCn/Er8= DKIM-Signature: v=1; a=ed25519-sha256; c=relaxed/relaxed; d=suse.de; s=susede2_ed25519; t=1777997368; h=from:from:reply-to: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=ih7EP1hGcdM62oFC55Hb51YORj/ldUEDXIPDlWObwhA=; b=J2tyBysP5BP5xsqKOjN1SXlvYbwVbcK5bxIeyeG+hrgbIpdMu9mJC5QqWT6ElL8tjETuaV +7em3ixod9ram5DA== From: Fabiano Rosas To: qemu-devel@nongnu.org Cc: Peter Xu , Laurent Vivier , Paolo Bonzini Subject: [PATCH v1 03/15] tests/qtest/migration: Set file URI by default Date: Tue, 5 May 2026 13:09:02 -0300 Message-ID: <20260505160915.25558-4-farosas@suse.de> X-Mailer: git-send-email 2.51.0 In-Reply-To: <20260505160915.25558-1-farosas@suse.de> References: <20260505160915.25558-1-farosas@suse.de> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable X-Spamd-Result: default: False [-2.80 / 50.00]; BAYES_HAM(-3.00)[100.00%]; NEURAL_HAM_LONG(-1.00)[-1.000]; MID_CONTAINS_FROM(1.00)[]; R_MISSING_CHARSET(0.50)[]; NEURAL_HAM_SHORT(-0.20)[-1.000]; MIME_GOOD(-0.10)[text/plain]; TO_MATCH_ENVRCPT_ALL(0.00)[]; FROM_HAS_DN(0.00)[]; ARC_NA(0.00)[]; MIME_TRACE(0.00)[0:+]; TO_DN_SOME(0.00)[]; DBL_BLOCKED_OPENRESOLVER(0.00)[imap1.dmz-prg2.suse.org:helo,suse.de:mid,suse.de:email]; RCVD_VIA_SMTP_AUTH(0.00)[]; FROM_EQ_ENVFROM(0.00)[]; RCVD_COUNT_TWO(0.00)[2]; FUZZY_RATELIMITED(0.00)[rspamd.com]; DKIM_SIGNED(0.00)[suse.de:s=susede2_rsa,suse.de:s=susede2_ed25519]; RCPT_COUNT_THREE(0.00)[4]; RCVD_TLS_ALL(0.00)[] X-Spam-Score: -2.80 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=lists1p.gnu.org; Received-SPF: pass client-ip=195.135.223.130; envelope-from=farosas@suse.de; helo=smtp-out1.suse.de X-Spam_score_int: -43 X-Spam_score: -4.4 X-Spam_bar: ---- X-Spam_report: (-4.4 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_MED=-2.3, SPF_HELO_NONE=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 @suse.de) X-ZM-MESSAGEID: 1777997538681158500 Content-Type: text/plain; charset="utf-8" Most file: tests use the same URI. Make it a default in the common function. Signed-off-by: Fabiano Rosas Reviewed-by: Peter Xu --- tests/qtest/migration/file-tests.c | 29 ----------------------------- tests/qtest/migration/framework.c | 6 ++++++ 2 files changed, 6 insertions(+), 29 deletions(-) diff --git a/tests/qtest/migration/file-tests.c b/tests/qtest/migration/fil= e-tests.c index 75135447f8..4b6a2eeb7b 100644 --- a/tests/qtest/migration/file-tests.c +++ b/tests/qtest/migration/file-tests.c @@ -67,9 +67,6 @@ static void test_file_connect_outgoing_fd_leak(char *name= , MigrateCommon *args) =20 static void test_precopy_file(char *name, MigrateCommon *args) { - g_autofree char *uri =3D g_strdup_printf("file:%s/%s", tmpfs, - FILE_TEST_FILENAME); - args->connect_uri =3D uri; test_file_common(args, true); } =20 @@ -142,11 +139,6 @@ static void test_precopy_file_offset_bad(char *name, M= igrateCommon *args) =20 static void test_precopy_file_mapped_ram_live(char *name, MigrateCommon *a= rgs) { - g_autofree char *uri =3D g_strdup_printf("file:%s/%s", tmpfs, - FILE_TEST_FILENAME); - - args->connect_uri =3D uri; - args->start.caps[MIGRATION_CAPABILITY_MAPPED_RAM] =3D true; =20 test_file_common(args, false); @@ -154,11 +146,6 @@ static void test_precopy_file_mapped_ram_live(char *na= me, MigrateCommon *args) =20 static void test_precopy_file_mapped_ram(char *name, MigrateCommon *args) { - g_autofree char *uri =3D g_strdup_printf("file:%s/%s", tmpfs, - FILE_TEST_FILENAME); - - args->connect_uri =3D uri; - args->start.caps[MIGRATION_CAPABILITY_MAPPED_RAM] =3D true; =20 test_file_common(args, true); @@ -166,10 +153,6 @@ static void test_precopy_file_mapped_ram(char *name, M= igrateCommon *args) =20 static void test_multifd_file_mapped_ram_live(char *name, MigrateCommon *a= rgs) { - g_autofree char *uri =3D g_strdup_printf("file:%s/%s", tmpfs, - FILE_TEST_FILENAME); - args->connect_uri =3D uri; - args->start.caps[MIGRATION_CAPABILITY_MULTIFD] =3D true; args->start.caps[MIGRATION_CAPABILITY_MAPPED_RAM] =3D true; =20 @@ -178,11 +161,6 @@ static void test_multifd_file_mapped_ram_live(char *na= me, MigrateCommon *args) =20 static void test_multifd_file_mapped_ram(char *name, MigrateCommon *args) { - g_autofree char *uri =3D g_strdup_printf("file:%s/%s", tmpfs, - FILE_TEST_FILENAME); - - args->connect_uri =3D uri; - args->start.caps[MIGRATION_CAPABILITY_MULTIFD] =3D true; args->start.caps[MIGRATION_CAPABILITY_MAPPED_RAM] =3D true; =20 @@ -200,9 +178,6 @@ static void *migrate_hook_start_multifd_mapped_ram_dio(= QTestState *from, =20 static void test_multifd_file_mapped_ram_dio(char *name, MigrateCommon *ar= gs) { - g_autofree char *uri =3D g_strdup_printf("file:%s/%s", tmpfs, - FILE_TEST_FILENAME); - args->connect_uri =3D uri; args->start_hook =3D migrate_hook_start_multifd_mapped_ram_dio; =20 args->start.caps[MIGRATION_CAPABILITY_MAPPED_RAM] =3D true; @@ -316,10 +291,6 @@ static void migration_test_add_file_smoke(MigrationTes= tEnv *env) static void test_precopy_file_mapped_ram_ignore_shared(char *name, MigrateCommon *args) { - g_autofree char *uri =3D g_strdup_printf("file:%s/%s", tmpfs, - FILE_TEST_FILENAME); - args->connect_uri =3D uri; - args->start.caps[MIGRATION_CAPABILITY_MAPPED_RAM] =3D true; args->start.caps[MIGRATION_CAPABILITY_X_IGNORE_SHARED] =3D true; =20 diff --git a/tests/qtest/migration/framework.c b/tests/qtest/migration/fram= ework.c index edd3d0b165..42f565af7b 100644 --- a/tests/qtest/migration/framework.c +++ b/tests/qtest/migration/framework.c @@ -971,11 +971,17 @@ void test_file_common(MigrateCommon *args, bool stop_= src) QTestState *from, *to; void *data_hook =3D NULL; bool check_offset =3D false; + g_autofree char *uri =3D NULL; =20 if (migrate_start(&from, &to, "defer", &args->start)) { return; } =20 + if (!args->connect_uri) { + uri =3D g_strdup_printf("file:%s/%s", tmpfs, FILE_TEST_FILENAME); + args->connect_uri =3D uri; + } + /* * File migration is never live. We can keep the source VM running * during migration, but the destination will not be running --=20 2.51.0 From nobody Tue May 26 12:01:12 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=suse.de ARC-Seal: i=1; a=rsa-sha256; t=1777997481; cv=none; d=zohomail.com; s=zohoarc; b=lfziSF+B8lIk0c2vxctRU9JIiUy2ZSwSOo5gafx5coN5qi1btmYz3ebGhv7zsww2CGd+FU41AvH+sOMLk/+UU0MhtEIV748q6ldd0PonVUHxc0uk7pESgYvmsqfz/zUhkDFmCPS6OHyD99Yg05BusImVxnMLOt6X5BWr2DqugQw= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1777997481; 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=zYZtWW/BG1VVPc2RlzeHfPalbRqchXjdPpj+gIrK+Rg=; b=S+FP+Z1NUiMi0hCBKCoAaZ46WmagyB9slA1aqGC9fWdCjRkCLkqm4weco+xeqsUry/msEpcdrqK30r0RnuQ7mTe83k3Q+Mrvub78fvaOkYyBjSdQ6Q39PZV6WB1Cwa4RL0zCc++VL8+32meVWv4tE+a6P+AtASluqCITFCLPUEg= 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 lists1p.gnu.org (lists1p.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1777997481183141.5232516584373; Tue, 5 May 2026 09:11:21 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists1p.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1wKIM4-0008QZ-BU; Tue, 05 May 2026 12:10:40 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists1p.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1wKILC-0007w5-Rp for qemu-devel@nongnu.org; Tue, 05 May 2026 12:09:48 -0400 Received: from smtp-out2.suse.de ([195.135.223.131]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1wKIL9-0007RT-Dc for qemu-devel@nongnu.org; Tue, 05 May 2026 12:09:46 -0400 Received: from imap1.dmz-prg2.suse.org (unknown [10.150.64.97]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by smtp-out2.suse.de (Postfix) with ESMTPS id 910CC5CB10; Tue, 5 May 2026 16:09:29 +0000 (UTC) Received: from imap1.dmz-prg2.suse.org (localhost [127.0.0.1]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by imap1.dmz-prg2.suse.org (Postfix) with ESMTPS id 6C9EB593A3; Tue, 5 May 2026 16:09:28 +0000 (UTC) Received: from dovecot-director2.suse.de ([2a07:de40:b281:106:10:150:64:167]) by imap1.dmz-prg2.suse.org with ESMTPSA id 4D1fDzgW+mmNcgAAD6G6ig (envelope-from ); Tue, 05 May 2026 16:09:28 +0000 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=suse.de; s=susede2_rsa; t=1777997369; h=from:from:reply-to: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=zYZtWW/BG1VVPc2RlzeHfPalbRqchXjdPpj+gIrK+Rg=; b=D8blho+5DO0lqsUOXGG4EnoWqPj7jXMR9f3UJrIjGMmsZRuUU2nj3Us4AcmmqjNG/iQMHq tlxTN1GKCIjPUiG48PzxxJs0ewI3e4fP3zufit8NvjT1fwA8Mko+RoWUwkPqCkPdug0/G3 FG16gJdm5YtcHHcNwK4k0Ek9ktE62a4= DKIM-Signature: v=1; a=ed25519-sha256; c=relaxed/relaxed; d=suse.de; s=susede2_ed25519; t=1777997369; h=from:from:reply-to: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=zYZtWW/BG1VVPc2RlzeHfPalbRqchXjdPpj+gIrK+Rg=; b=JspJLqEUCHRhcFJkjRviJqsLqf2nu39JpEHs5SAEHFLko0bE9k/UiDsAIYimXw4AjqPZGX oXxcku7y/b5UzTAg== Authentication-Results: smtp-out2.suse.de; none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=suse.de; s=susede2_rsa; t=1777997369; h=from:from:reply-to: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=zYZtWW/BG1VVPc2RlzeHfPalbRqchXjdPpj+gIrK+Rg=; b=D8blho+5DO0lqsUOXGG4EnoWqPj7jXMR9f3UJrIjGMmsZRuUU2nj3Us4AcmmqjNG/iQMHq tlxTN1GKCIjPUiG48PzxxJs0ewI3e4fP3zufit8NvjT1fwA8Mko+RoWUwkPqCkPdug0/G3 FG16gJdm5YtcHHcNwK4k0Ek9ktE62a4= DKIM-Signature: v=1; a=ed25519-sha256; c=relaxed/relaxed; d=suse.de; s=susede2_ed25519; t=1777997369; h=from:from:reply-to: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=zYZtWW/BG1VVPc2RlzeHfPalbRqchXjdPpj+gIrK+Rg=; b=JspJLqEUCHRhcFJkjRviJqsLqf2nu39JpEHs5SAEHFLko0bE9k/UiDsAIYimXw4AjqPZGX oXxcku7y/b5UzTAg== From: Fabiano Rosas To: qemu-devel@nongnu.org Cc: Peter Xu , Laurent Vivier , Paolo Bonzini Subject: [PATCH v1 04/15] tests/qtest/migration: Group unix migration tests Date: Tue, 5 May 2026 13:09:03 -0300 Message-ID: <20260505160915.25558-5-farosas@suse.de> X-Mailer: git-send-email 2.51.0 In-Reply-To: <20260505160915.25558-1-farosas@suse.de> References: <20260505160915.25558-1-farosas@suse.de> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable X-Spam-Score: -2.80 X-Spamd-Result: default: False [-2.80 / 50.00]; BAYES_HAM(-3.00)[100.00%]; NEURAL_HAM_LONG(-1.00)[-1.000]; MID_CONTAINS_FROM(1.00)[]; R_MISSING_CHARSET(0.50)[]; NEURAL_HAM_SHORT(-0.20)[-1.000]; MIME_GOOD(-0.10)[text/plain]; TO_MATCH_ENVRCPT_ALL(0.00)[]; FROM_HAS_DN(0.00)[]; ARC_NA(0.00)[]; MIME_TRACE(0.00)[0:+]; TO_DN_SOME(0.00)[]; DBL_BLOCKED_OPENRESOLVER(0.00)[suse.de:email,suse.de:mid,imap1.dmz-prg2.suse.org:helo]; RCVD_VIA_SMTP_AUTH(0.00)[]; FROM_EQ_ENVFROM(0.00)[]; RCVD_COUNT_TWO(0.00)[2]; FUZZY_RATELIMITED(0.00)[rspamd.com]; DKIM_SIGNED(0.00)[suse.de:s=susede2_rsa,suse.de:s=susede2_ed25519]; RCPT_COUNT_THREE(0.00)[4]; RCVD_TLS_ALL(0.00)[] 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=lists1p.gnu.org; Received-SPF: pass client-ip=195.135.223.131; envelope-from=farosas@suse.de; helo=smtp-out2.suse.de X-Spam_score_int: -43 X-Spam_score: -4.4 X-Spam_bar: ---- X-Spam_report: (-4.4 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_MED=-2.3, SPF_HELO_NONE=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 @suse.de) X-ZM-MESSAGEID: 1777997482309158500 Content-Type: text/plain; charset="utf-8" Remove some repetition when defining unix: tests by introducing a _common function. Signed-off-by: Fabiano Rosas Reviewed-by: Peter Xu --- tests/qtest/migration/compression-tests.c | 6 +---- tests/qtest/migration/framework.c | 9 +++++++ tests/qtest/migration/framework.h | 1 + tests/qtest/migration/precopy-tests.c | 30 +++-------------------- tests/qtest/migration/tls-tests.c | 12 ++------- 5 files changed, 17 insertions(+), 41 deletions(-) diff --git a/tests/qtest/migration/compression-tests.c b/tests/qtest/migrat= ion/compression-tests.c index 845e622cd5..7f2856b7f8 100644 --- a/tests/qtest/migration/compression-tests.c +++ b/tests/qtest/migration/compression-tests.c @@ -123,10 +123,6 @@ migrate_hook_start_xbzrle(QTestState *from, =20 static void test_precopy_unix_xbzrle(char *name, MigrateCommon *args) { - g_autofree char *uri =3D g_strdup_printf("unix:%s/migsocket", tmpfs); - - args->connect_uri =3D uri; - args->listen_uri =3D uri; args->start_hook =3D migrate_hook_start_xbzrle; args->iterations =3D 2; /* @@ -137,7 +133,7 @@ static void test_precopy_unix_xbzrle(char *name, Migrat= eCommon *args) =20 args->start.caps[MIGRATION_CAPABILITY_XBZRLE] =3D true; =20 - test_precopy_common(args); + test_precopy_unix_common(args); } =20 static void * diff --git a/tests/qtest/migration/framework.c b/tests/qtest/migration/fram= ework.c index 42f565af7b..73bb015f64 100644 --- a/tests/qtest/migration/framework.c +++ b/tests/qtest/migration/framework.c @@ -934,6 +934,15 @@ finish: return 0; } =20 +void test_precopy_unix_common(MigrateCommon *args) +{ + g_autofree char *uri =3D g_strdup_printf("unix:%s/migsocket", tmpfs); + + args->listen_uri =3D uri; + args->connect_uri =3D uri; + test_precopy_common(args); +} + static void file_dirty_offset_region(void) { g_autofree char *path =3D g_strdup_printf("%s/%s", tmpfs, FILE_TEST_FI= LENAME); diff --git a/tests/qtest/migration/framework.h b/tests/qtest/migration/fram= ework.h index 13ce84b49e..613839dec8 100644 --- a/tests/qtest/migration/framework.h +++ b/tests/qtest/migration/framework.h @@ -239,6 +239,7 @@ void test_postcopy_common(MigrateCommon *args); void test_postcopy_recovery_common(MigrateCommon *args, PostcopyRecoveryFailStage fail_stage); int test_precopy_common(MigrateCommon *args); +void test_precopy_unix_common(MigrateCommon *args); void test_file_common(MigrateCommon *args, bool stop_src); void *migrate_hook_start_precopy_tcp_multifd_common(QTestState *from, QTestState *to, diff --git a/tests/qtest/migration/precopy-tests.c b/tests/qtest/migration/= precopy-tests.c index a0e3ff0547..54e45e2a02 100644 --- a/tests/qtest/migration/precopy-tests.c +++ b/tests/qtest/migration/precopy-tests.c @@ -37,62 +37,40 @@ static char *tmpfs; =20 static void test_precopy_unix_plain(char *name, MigrateCommon *args) { - g_autofree char *uri =3D g_strdup_printf("unix:%s/migsocket", tmpfs); - - args->listen_uri =3D uri; - args->connect_uri =3D uri; /* * The simplest use case of precopy, covering smoke tests of * get-dirty-log dirty tracking. */ args->live =3D true; - - test_precopy_common(args); + test_precopy_unix_common(args); } =20 static void test_precopy_unix_suspend_live(char *name, MigrateCommon *args) { - g_autofree char *uri =3D g_strdup_printf("unix:%s/migsocket", tmpfs); - - args->listen_uri =3D uri; - args->connect_uri =3D uri; /* * despite being live, the test is fast because the src * suspends immediately. */ args->live =3D true; - args->start.suspend_me =3D true; - - test_precopy_common(args); + test_precopy_unix_common(args); } =20 static void test_precopy_unix_suspend_notlive(char *name, MigrateCommon *a= rgs) { - g_autofree char *uri =3D g_strdup_printf("unix:%s/migsocket", tmpfs); - - args->listen_uri =3D uri; - args->connect_uri =3D uri; args->start.suspend_me =3D true; - - test_precopy_common(args); + test_precopy_unix_common(args); } =20 static void test_precopy_unix_dirty_ring(char *name, MigrateCommon *args) { - g_autofree char *uri =3D g_strdup_printf("unix:%s/migsocket", tmpfs); - - args->listen_uri =3D uri; - args->connect_uri =3D uri; /* * Besides the precopy/unix basic test, cover dirty ring interface * rather than get-dirty-log. */ args->live =3D true; - args->start.use_dirty_ring =3D true; - - test_precopy_common(args); + test_precopy_unix_common(args); } =20 #ifdef CONFIG_RDMA diff --git a/tests/qtest/migration/tls-tests.c b/tests/qtest/migration/tls-= tests.c index 87898af260..0677ca661e 100644 --- a/tests/qtest/migration/tls-tests.c +++ b/tests/qtest/migration/tls-tests.c @@ -424,14 +424,10 @@ static void test_multifd_postcopy_preempt_recovery_tl= s_psk(char *name, =20 static void test_precopy_unix_tls_psk(char *name, MigrateCommon *args) { - g_autofree char *uri =3D g_strdup_printf("unix:%s/migsocket", tmpfs); - - args->connect_uri =3D uri; - args->listen_uri =3D uri; args->start_hook =3D migrate_hook_start_tls_psk_match; args->end_hook =3D migrate_hook_end_tls_psk; =20 - test_precopy_common(args); + test_precopy_unix_common(args); } =20 #ifdef CONFIG_TASN1 @@ -454,14 +450,10 @@ static void test_precopy_unix_tls_x509_default_host(c= har *name, static void test_precopy_unix_tls_x509_override_host(char *name, MigrateCommon *args) { - g_autofree char *uri =3D g_strdup_printf("unix:%s/migsocket", tmpfs); - - args->connect_uri =3D uri; - args->listen_uri =3D uri; args->start_hook =3D migrate_hook_start_tls_x509_override_host; args->end_hook =3D migrate_hook_end_tls_x509; =20 - test_precopy_common(args); + test_precopy_unix_common(args); } #endif /* CONFIG_TASN1 */ =20 --=20 2.51.0 From nobody Tue May 26 12:01:12 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=suse.de ARC-Seal: i=1; a=rsa-sha256; t=1777997520; cv=none; d=zohomail.com; s=zohoarc; b=VzRnCY1K3XyRvYmSYPFmavDYjwHhFi0QR9FyhENVcFimXtNNOiw78uRKX2xzpvkKuhLNGoRLgY3RG/j8hS8+K9JSNb4gthjG6K86KsnZvr7Dm+yNSRLKpyafehtwyUHVHM/eNiecfcI8qLxb211j9BywBnQJfg4jOnE1Yvr/Q4g= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1777997520; 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=zlACn550C2kY5jRmhCHCPEFoNUu1oljVf9BIVf0CMq8=; b=lHX0+DMCBSCh9ZNi2FZoOBenNqceB1CAk/J6EatoFiGMwkMwb+XU5rxpJCb63wrbilEcgSPtzJ7C5rY5NSVWs/WpYch1VZK85NRmrjeG8dd8uaDlOxAAfx7+HUvJgiNn5fSBADZUC6jH6Xdb3MaYCfdTKWqgTh0ZA0JXvCsdKdY= 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 lists1p.gnu.org (lists1p.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1777997520222919.1006076513594; Tue, 5 May 2026 09:12:00 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists1p.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1wKIM7-0008SV-Ko; Tue, 05 May 2026 12:10:45 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists1p.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1wKILP-00084I-43 for qemu-devel@nongnu.org; Tue, 05 May 2026 12:09:59 -0400 Received: from smtp-out1.suse.de ([2a07:de40:b251:101:10:150:64:1]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1wKILM-0008IX-UZ for qemu-devel@nongnu.org; Tue, 05 May 2026 12:09:58 -0400 Received: from imap1.dmz-prg2.suse.org (unknown [10.150.64.97]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by smtp-out1.suse.de (Postfix) with ESMTPS id 1F6716B75E; Tue, 5 May 2026 16:09:31 +0000 (UTC) Received: from imap1.dmz-prg2.suse.org (localhost [127.0.0.1]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by imap1.dmz-prg2.suse.org (Postfix) with ESMTPS id EEF6E593A3; Tue, 5 May 2026 16:09:29 +0000 (UTC) Received: from dovecot-director2.suse.de ([2a07:de40:b281:106:10:150:64:167]) by imap1.dmz-prg2.suse.org with ESMTPSA id OMkzLzkW+mmNcgAAD6G6ig (envelope-from ); Tue, 05 May 2026 16:09:29 +0000 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=suse.de; s=susede2_rsa; t=1777997371; h=from:from:reply-to: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=zlACn550C2kY5jRmhCHCPEFoNUu1oljVf9BIVf0CMq8=; b=AWPgHRFBYrJxxyXdsVDeCzrXqBtMu78IJFgwhiBGeJDrCNwdhSOuazbR/un+Fa3UPrgmyC iauuDoM271/zxOp1bZCnzQI3H0Ix5a/oTMcgLmLD/USyrV9F0uey0VXy2z8xseReenOi4z 1pSrcxXt7ESgTXWPkXBXzP5dXvNXYto= DKIM-Signature: v=1; a=ed25519-sha256; c=relaxed/relaxed; d=suse.de; s=susede2_ed25519; t=1777997371; h=from:from:reply-to: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=zlACn550C2kY5jRmhCHCPEFoNUu1oljVf9BIVf0CMq8=; b=U7Rt7JKjXp3r0QRi/0wJwNDFmuEQBW+AzhkDo42NN4ory2S//hSXObrn8NuUu0bkwLifPB JQEw26nI5b9xgDDA== Authentication-Results: smtp-out1.suse.de; none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=suse.de; s=susede2_rsa; t=1777997371; h=from:from:reply-to: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=zlACn550C2kY5jRmhCHCPEFoNUu1oljVf9BIVf0CMq8=; b=AWPgHRFBYrJxxyXdsVDeCzrXqBtMu78IJFgwhiBGeJDrCNwdhSOuazbR/un+Fa3UPrgmyC iauuDoM271/zxOp1bZCnzQI3H0Ix5a/oTMcgLmLD/USyrV9F0uey0VXy2z8xseReenOi4z 1pSrcxXt7ESgTXWPkXBXzP5dXvNXYto= DKIM-Signature: v=1; a=ed25519-sha256; c=relaxed/relaxed; d=suse.de; s=susede2_ed25519; t=1777997371; h=from:from:reply-to: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=zlACn550C2kY5jRmhCHCPEFoNUu1oljVf9BIVf0CMq8=; b=U7Rt7JKjXp3r0QRi/0wJwNDFmuEQBW+AzhkDo42NN4ory2S//hSXObrn8NuUu0bkwLifPB JQEw26nI5b9xgDDA== From: Fabiano Rosas To: qemu-devel@nongnu.org Cc: Peter Xu , Laurent Vivier , Paolo Bonzini Subject: [PATCH v1 05/15] tests/qtest/migration: Use precopy_unix_common for ignore-shared test Date: Tue, 5 May 2026 13:09:04 -0300 Message-ID: <20260505160915.25558-6-farosas@suse.de> X-Mailer: git-send-email 2.51.0 In-Reply-To: <20260505160915.25558-1-farosas@suse.de> References: <20260505160915.25558-1-farosas@suse.de> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable X-Spamd-Result: default: False [-2.80 / 50.00]; BAYES_HAM(-3.00)[100.00%]; NEURAL_HAM_LONG(-1.00)[-1.000]; MID_CONTAINS_FROM(1.00)[]; R_MISSING_CHARSET(0.50)[]; NEURAL_HAM_SHORT(-0.20)[-1.000]; MIME_GOOD(-0.10)[text/plain]; TO_MATCH_ENVRCPT_ALL(0.00)[]; FROM_HAS_DN(0.00)[]; ARC_NA(0.00)[]; MIME_TRACE(0.00)[0:+]; TO_DN_SOME(0.00)[]; DBL_BLOCKED_OPENRESOLVER(0.00)[suse.de:mid,suse.de:email,imap1.dmz-prg2.suse.org:helo]; RCVD_VIA_SMTP_AUTH(0.00)[]; FROM_EQ_ENVFROM(0.00)[]; RCVD_COUNT_TWO(0.00)[2]; FUZZY_RATELIMITED(0.00)[rspamd.com]; DKIM_SIGNED(0.00)[suse.de:s=susede2_rsa,suse.de:s=susede2_ed25519]; RCPT_COUNT_THREE(0.00)[4]; RCVD_TLS_ALL(0.00)[] X-Spam-Score: -2.80 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=lists1p.gnu.org; Received-SPF: pass client-ip=2a07:de40:b251:101:10:150:64:1; envelope-from=farosas@suse.de; helo=smtp-out1.suse.de 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, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, SPF_HELO_NONE=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 @suse.de) X-ZM-MESSAGEID: 1777997522745154101 Content-Type: text/plain; charset="utf-8" The ignore-shared test has the same code as the precopy_common test but inverting (probably incorrectly) the order of a few event waits. Change it to use the common code instead. Signed-off-by: Fabiano Rosas Reviewed-by: Peter Xu --- tests/qtest/migration/misc-tests.c | 40 ++++++++---------------------- 1 file changed, 11 insertions(+), 29 deletions(-) diff --git a/tests/qtest/migration/misc-tests.c b/tests/qtest/migration/mis= c-tests.c index e114ac5972..8d1cd44183 100644 --- a/tests/qtest/migration/misc-tests.c +++ b/tests/qtest/migration/misc-tests.c @@ -90,40 +90,22 @@ static void test_analyze_script(char *name, MigrateComm= on *args) } #endif =20 -static void test_ignore_shared(char *name, MigrateCommon *args) +static void ignore_shared_assert_skipped(QTestState *from, QTestState *to, + void *data) { - g_autofree char *uri =3D g_strdup_printf("unix:%s/migsocket", tmpfs); - QTestState *from, *to; - - args->start.mem_type =3D MEM_TYPE_SHMEM; - args->start.caps[MIGRATION_CAPABILITY_X_IGNORE_SHARED] =3D true; - - if (migrate_start(&from, &to, uri, &args->start)) { - return; - } - - migrate_ensure_non_converge(from); - migrate_prepare_for_dirty_mem(from); - - /* Wait for the first serial output from the source */ - wait_for_serial("src_serial"); - - migrate_qmp(from, to, uri, NULL, "{}"); - - migrate_wait_for_dirty_mem(from, to); - - wait_for_stop(from, get_src()); - - qtest_qmp_eventwait(to, "RESUME"); - - wait_for_serial("dest_serial"); - wait_for_migration_complete(from); - /* Check whether shared RAM has been really skipped */ g_assert_cmpint( read_ram_property_int(from, "transferred"), <, 4 * 1024 * 1024); +} =20 - migrate_end(from, to, true); +static void test_ignore_shared(char *name, MigrateCommon *args) +{ + args->live =3D true; + args->start.mem_type =3D MEM_TYPE_SHMEM; + args->start.caps[MIGRATION_CAPABILITY_X_IGNORE_SHARED] =3D true; + args->end_hook =3D ignore_shared_assert_skipped; + + test_precopy_unix_common(args); } =20 static void do_test_validate_uuid(MigrateStart *args, bool should_fail) --=20 2.51.0 From nobody Tue May 26 12:01:12 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=suse.de ARC-Seal: i=1; a=rsa-sha256; t=1777997520; cv=none; d=zohomail.com; s=zohoarc; b=cJtUY3AVnKzY7i2DRfYOwwndy8rLQxS79byCeH8zK9+uLkGZK7JPrQ5ke7XLE7KQDm4g/R27MgAc1etDddJjLc0u0yODy+xxAlY260dnHDJFToYusCQQavQZ9NTD+sJ9HC6rMikb5qq4rFxIJoNXVcRONTd1L/zSQ3hHvSTqQas= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1777997520; 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=RvQCMVyCnjQXWQYttKYnop1DT8sWT0Mzcw0AThqmErA=; b=OSNq21VWV0UYNrLha3bvTszsNbUJI3xBcV+S2YhrH7exykGZXlJUJevMDuEtJVYhQgUmg9fmC8BorcfvanvViKqJzR7nHIlY71BySQl15b0AKXlUl8OZqkNAd3rAxQFhePjFenCJtBRxRZ1PUxVT1kwPBnfocLUKBeMvtMlVcto= 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 lists1p.gnu.org (lists1p.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1777997520599193.5121682443172; Tue, 5 May 2026 09:12:00 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists1p.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1wKIMG-0008WS-G6; Tue, 05 May 2026 12:10:52 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists1p.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1wKILW-00087R-0H for qemu-devel@nongnu.org; Tue, 05 May 2026 12:10:06 -0400 Received: from smtp-out1.suse.de ([195.135.223.130]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1wKILT-0000Fs-1x for qemu-devel@nongnu.org; Tue, 05 May 2026 12:10:04 -0400 Received: from imap1.dmz-prg2.suse.org (imap1.dmz-prg2.suse.org [IPv6:2a07:de40:b281:104:10:150:64:97]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by smtp-out1.suse.de (Postfix) with ESMTPS id A539D6B765; Tue, 5 May 2026 16:09:32 +0000 (UTC) Received: from imap1.dmz-prg2.suse.org (localhost [127.0.0.1]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by imap1.dmz-prg2.suse.org (Postfix) with ESMTPS id 812A2593A3; Tue, 5 May 2026 16:09:31 +0000 (UTC) Received: from dovecot-director2.suse.de ([2a07:de40:b281:106:10:150:64:167]) by imap1.dmz-prg2.suse.org with ESMTPSA id MKFRFDsW+mmNcgAAD6G6ig (envelope-from ); Tue, 05 May 2026 16:09:31 +0000 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=suse.de; s=susede2_rsa; t=1777997372; h=from:from:reply-to: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=RvQCMVyCnjQXWQYttKYnop1DT8sWT0Mzcw0AThqmErA=; b=CYO1tLJW+iwUtI0QfY1LU5Jr8mrE0+K1qjksPHJQDJdae4MLXNVq0aaoQ3M4WL2NezOv2z PZcteI4LSvD1wgcD6IOXaYBNEGFIS/a9LgsGkoWD4NmP8po6tVVTn3vUIgfb4+4INlTeJM FyNxDjeXzspzg4C+eZp69ubfvdWEVr0= DKIM-Signature: v=1; a=ed25519-sha256; c=relaxed/relaxed; d=suse.de; s=susede2_ed25519; t=1777997372; h=from:from:reply-to: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=RvQCMVyCnjQXWQYttKYnop1DT8sWT0Mzcw0AThqmErA=; b=MYrHhsBJ24iPcMvuiFs6ORfu2/QBTcAv4tdtIR52VHD5LvNh15ZZSPXa9A1ay58umGx/OM +altg7PmgGtu8GCQ== Authentication-Results: smtp-out1.suse.de; dkim=pass header.d=suse.de header.s=susede2_rsa header.b=CYO1tLJW; dkim=pass header.d=suse.de header.s=susede2_ed25519 header.b=MYrHhsBJ DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=suse.de; s=susede2_rsa; t=1777997372; h=from:from:reply-to: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=RvQCMVyCnjQXWQYttKYnop1DT8sWT0Mzcw0AThqmErA=; b=CYO1tLJW+iwUtI0QfY1LU5Jr8mrE0+K1qjksPHJQDJdae4MLXNVq0aaoQ3M4WL2NezOv2z PZcteI4LSvD1wgcD6IOXaYBNEGFIS/a9LgsGkoWD4NmP8po6tVVTn3vUIgfb4+4INlTeJM FyNxDjeXzspzg4C+eZp69ubfvdWEVr0= DKIM-Signature: v=1; a=ed25519-sha256; c=relaxed/relaxed; d=suse.de; s=susede2_ed25519; t=1777997372; h=from:from:reply-to: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=RvQCMVyCnjQXWQYttKYnop1DT8sWT0Mzcw0AThqmErA=; b=MYrHhsBJ24iPcMvuiFs6ORfu2/QBTcAv4tdtIR52VHD5LvNh15ZZSPXa9A1ay58umGx/OM +altg7PmgGtu8GCQ== From: Fabiano Rosas To: qemu-devel@nongnu.org Cc: Peter Xu , Laurent Vivier , Paolo Bonzini Subject: [PATCH v1 06/15] tests/qtest/migration: Use a default TCP URI for precopy Date: Tue, 5 May 2026 13:09:05 -0300 Message-ID: <20260505160915.25558-7-farosas@suse.de> X-Mailer: git-send-email 2.51.0 In-Reply-To: <20260505160915.25558-1-farosas@suse.de> References: <20260505160915.25558-1-farosas@suse.de> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable X-Spam-Score: -3.01 X-Rspamd-Action: no action X-Spamd-Result: default: False [-3.01 / 50.00]; BAYES_HAM(-3.00)[100.00%]; MID_CONTAINS_FROM(1.00)[]; NEURAL_HAM_LONG(-1.00)[-1.000]; R_MISSING_CHARSET(0.50)[]; R_DKIM_ALLOW(-0.20)[suse.de:s=susede2_rsa,suse.de:s=susede2_ed25519]; NEURAL_HAM_SHORT(-0.20)[-1.000]; MIME_GOOD(-0.10)[text/plain]; MX_GOOD(-0.01)[]; TO_DN_SOME(0.00)[]; ARC_NA(0.00)[]; FUZZY_RATELIMITED(0.00)[rspamd.com]; SPAMHAUS_XBL(0.00)[2a07:de40:b281:104:10:150:64:97:from]; MIME_TRACE(0.00)[0:+]; RCVD_VIA_SMTP_AUTH(0.00)[]; DNSWL_BLOCKED(0.00)[2a07:de40:b281:106:10:150:64:167:received]; DKIM_SIGNED(0.00)[suse.de:s=susede2_rsa,suse.de:s=susede2_ed25519]; FROM_EQ_ENVFROM(0.00)[]; FROM_HAS_DN(0.00)[]; RCPT_COUNT_THREE(0.00)[4]; RCVD_TLS_ALL(0.00)[]; DBL_BLOCKED_OPENRESOLVER(0.00)[imap1.dmz-prg2.suse.org:rdns,imap1.dmz-prg2.suse.org:helo,suse.de:email,suse.de:dkim,suse.de:mid]; RCVD_COUNT_TWO(0.00)[2]; TO_MATCH_ENVRCPT_ALL(0.00)[]; DKIM_TRACE(0.00)[suse.de:+] X-Rspamd-Server: rspamd1.dmz-prg2.suse.org X-Rspamd-Queue-Id: A539D6B765 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=lists1p.gnu.org; Received-SPF: pass client-ip=195.135.223.130; envelope-from=farosas@suse.de; helo=smtp-out1.suse.de X-Spam_score_int: -43 X-Spam_score: -4.4 X-Spam_bar: ---- X-Spam_report: (-4.4 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_MED=-2.3, SPF_HELO_NONE=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 @suse.de) X-ZM-MESSAGEID: 1777997522564158500 Content-Type: text/plain; charset="utf-8" Using a localhost TCP URI for testing is quite common. Set it as a default for precopy tests that don't provide an URI. Signed-off-by: Fabiano Rosas Reviewed-by: Peter Xu --- tests/qtest/migration/framework.c | 4 ++++ tests/qtest/migration/precopy-tests.c | 3 --- tests/qtest/migration/tls-tests.c | 9 --------- 3 files changed, 4 insertions(+), 12 deletions(-) diff --git a/tests/qtest/migration/framework.c b/tests/qtest/migration/fram= ework.c index 73bb015f64..b77889de7f 100644 --- a/tests/qtest/migration/framework.c +++ b/tests/qtest/migration/framework.c @@ -834,6 +834,10 @@ int test_precopy_common(MigrateCommon *args) void *data_hook =3D NULL; QObject *channels =3D NULL; =20 + if (!args->listen_uri) { + args->listen_uri =3D "tcp:127.0.0.1:0"; + } + if (migrate_start(&from, &to, args->listen_uri, &args->start)) { return -1; } diff --git a/tests/qtest/migration/precopy-tests.c b/tests/qtest/migration/= precopy-tests.c index 54e45e2a02..0d538bcd1a 100644 --- a/tests/qtest/migration/precopy-tests.c +++ b/tests/qtest/migration/precopy-tests.c @@ -180,14 +180,11 @@ static void test_precopy_rdma_plain_ipv6(char *name, = MigrateCommon *args) =20 static void test_precopy_tcp_plain(char *name, MigrateCommon *args) { - args->listen_uri =3D "tcp:127.0.0.1:0"; - test_precopy_common(args); } =20 static void test_precopy_tcp_switchover_ack(char *name, MigrateCommon *arg= s) { - args->listen_uri =3D "tcp:127.0.0.1:0"; /* * Source VM must be running in order to consider the switchover ACK * when deciding to do switchover or not. diff --git a/tests/qtest/migration/tls-tests.c b/tests/qtest/migration/tls-= tests.c index 0677ca661e..4a3c404349 100644 --- a/tests/qtest/migration/tls-tests.c +++ b/tests/qtest/migration/tls-tests.c @@ -459,7 +459,6 @@ static void test_precopy_unix_tls_x509_override_host(ch= ar *name, =20 static void test_precopy_tcp_tls_psk_match(char *name, MigrateCommon *args) { - args->listen_uri =3D "tcp:127.0.0.1:0"; args->start_hook =3D migrate_hook_start_tls_psk_match; args->end_hook =3D migrate_hook_end_tls_psk; =20 @@ -468,7 +467,6 @@ static void test_precopy_tcp_tls_psk_match(char *name, = MigrateCommon *args) =20 static void test_precopy_tcp_tls_psk_mismatch(char *name, MigrateCommon *a= rgs) { - args->listen_uri =3D "tcp:127.0.0.1:0"; args->start_hook =3D migrate_hook_start_tls_psk_mismatch; args->end_hook =3D migrate_hook_end_tls_psk; args->result =3D MIG_TEST_FAIL; @@ -488,7 +486,6 @@ static void *migrate_hook_start_no_tls(QTestState *from= , QTestState *to) =20 static void test_precopy_tcp_no_tls(char *name, MigrateCommon *args) { - args->listen_uri =3D "tcp:127.0.0.1:0"; args->start_hook =3D migrate_hook_start_no_tls; /* the no_tls start hook requires no cleanup actions */ args->end_hook =3D NULL; @@ -529,7 +526,6 @@ static void test_precopy_tcp_tls_no_hostname(char *name= , MigrateCommon *args) static void test_precopy_tcp_tls_x509_default_host(char *name, MigrateCommon *args) { - args->listen_uri =3D "tcp:127.0.0.1:0"; args->start_hook =3D migrate_hook_start_tls_x509_default_host; args->end_hook =3D migrate_hook_end_tls_x509; =20 @@ -539,7 +535,6 @@ static void test_precopy_tcp_tls_x509_default_host(char= *name, static void test_precopy_tcp_tls_x509_override_host(char *name, MigrateCommon *args) { - args->listen_uri =3D "tcp:127.0.0.1:0"; args->start_hook =3D migrate_hook_start_tls_x509_override_host; args->end_hook =3D migrate_hook_end_tls_x509; =20 @@ -563,7 +558,6 @@ static void test_precopy_tcp_tls_x509_mismatch_host(cha= r *name, static void test_precopy_tcp_tls_x509_friendly_client(char *name, MigrateCommon *args) { - args->listen_uri =3D "tcp:127.0.0.1:0"; args->start_hook =3D migrate_hook_start_tls_x509_friendly_client; args->end_hook =3D migrate_hook_end_tls_x509; =20 @@ -573,7 +567,6 @@ static void test_precopy_tcp_tls_x509_friendly_client(c= har *name, static void test_precopy_tcp_tls_x509_hostile_client(char *name, MigrateCommon *args) { - args->listen_uri =3D "tcp:127.0.0.1:0"; args->start_hook =3D migrate_hook_start_tls_x509_hostile_client; args->end_hook =3D migrate_hook_end_tls_x509; args->result =3D MIG_TEST_FAIL; @@ -586,7 +579,6 @@ static void test_precopy_tcp_tls_x509_hostile_client(ch= ar *name, static void test_precopy_tcp_tls_x509_allow_anon_client(char *name, MigrateCommon *arg= s) { - args->listen_uri =3D "tcp:127.0.0.1:0"; args->start_hook =3D migrate_hook_start_tls_x509_allow_anon_client; args->end_hook =3D migrate_hook_end_tls_x509; =20 @@ -596,7 +588,6 @@ static void test_precopy_tcp_tls_x509_allow_anon_client= (char *name, static void test_precopy_tcp_tls_x509_reject_anon_client(char *name, MigrateCommon *ar= gs) { - args->listen_uri =3D "tcp:127.0.0.1:0"; args->start_hook =3D migrate_hook_start_tls_x509_reject_anon_client; args->end_hook =3D migrate_hook_end_tls_x509; args->result =3D MIG_TEST_FAIL; --=20 2.51.0 From nobody Tue May 26 12:01:12 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=suse.de ARC-Seal: i=1; a=rsa-sha256; t=1777997548; cv=none; d=zohomail.com; s=zohoarc; b=EMQ3+06aZ4mXmzWT8ltztquczhZsAi57j4Tj7yMFtcwdxgJIHEwFfChV6TPAEqWHh28O3zFXGrYkFWL+unR6K8DRnBd2Nl1iOYxTUzDCkNUvsieidzqnE/+Q3VEPrBPrC4QxEbc+sD8YE0RHgk4NRPloOPV9t+9Hbbu7DhdWCOg= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1777997548; 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=Cb7zHppTTTPuuYGVnbjALadsZfX5j2jgmG1ucp8x/24=; b=fI49fw0Oj3VmZiXvFQEijMLFk/g9S7ayvRb4pZa7H0NmQlFagylekmRrdfkG49j9EFDiwTlWU/Byl7Mp3nfm8njxVbeDWH36kQV0h1qCZOd6bQHfmA7GECNtk8AqLgGNnYVMviKH0Y9RuKJTVksO+0PKZZwct6wSqe/9VmlkHT0= 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 lists1p.gnu.org (lists1p.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1777997548088432.0658821127488; Tue, 5 May 2026 09:12:28 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists1p.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1wKIMH-00006J-Eh; Tue, 05 May 2026 12:10:53 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists1p.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1wKILl-0008BV-BL for qemu-devel@nongnu.org; Tue, 05 May 2026 12:10:30 -0400 Received: from smtp-out1.suse.de ([195.135.223.130]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1wKILZ-0000XL-Ao for qemu-devel@nongnu.org; Tue, 05 May 2026 12:10:11 -0400 Received: from imap1.dmz-prg2.suse.org (unknown [10.150.64.97]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by smtp-out1.suse.de (Postfix) with ESMTPS id 683706B766; Tue, 5 May 2026 16:09:34 +0000 (UTC) Received: from imap1.dmz-prg2.suse.org (localhost [127.0.0.1]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by imap1.dmz-prg2.suse.org (Postfix) with ESMTPS id 16DC6593A6; Tue, 5 May 2026 16:09:32 +0000 (UTC) Received: from dovecot-director2.suse.de ([2a07:de40:b281:106:10:150:64:167]) by imap1.dmz-prg2.suse.org with ESMTPSA id yDoINjwW+mmNcgAAD6G6ig (envelope-from ); Tue, 05 May 2026 16:09:32 +0000 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=suse.de; s=susede2_rsa; t=1777997374; h=from:from:reply-to: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=Cb7zHppTTTPuuYGVnbjALadsZfX5j2jgmG1ucp8x/24=; b=yEV2EGyi757Y6m1cIMElntcAuRYH4vQhd0h2RTD29X8+gYdTIkNuzjp05EYs8ikI39G9iK TYBtRxFsZmZ6SVEOml5aR6svxv2BHX3nNMmjgvU0PK6cQIAnN03Sf0v51jZHonb2uCwe1B 6KrwShWkh6WBUnidwe5SbES2+/VN7zs= DKIM-Signature: v=1; a=ed25519-sha256; c=relaxed/relaxed; d=suse.de; s=susede2_ed25519; t=1777997374; h=from:from:reply-to: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=Cb7zHppTTTPuuYGVnbjALadsZfX5j2jgmG1ucp8x/24=; b=yNJFuCsmXzaa3/gbMe1P39fLddQl98UEkAsxuhwRh+NW08wDSalnXpVfe4U2U6RU3YeVz6 RAWw9ZqMb/Fg5cCg== Authentication-Results: smtp-out1.suse.de; none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=suse.de; s=susede2_rsa; t=1777997374; h=from:from:reply-to: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=Cb7zHppTTTPuuYGVnbjALadsZfX5j2jgmG1ucp8x/24=; b=yEV2EGyi757Y6m1cIMElntcAuRYH4vQhd0h2RTD29X8+gYdTIkNuzjp05EYs8ikI39G9iK TYBtRxFsZmZ6SVEOml5aR6svxv2BHX3nNMmjgvU0PK6cQIAnN03Sf0v51jZHonb2uCwe1B 6KrwShWkh6WBUnidwe5SbES2+/VN7zs= DKIM-Signature: v=1; a=ed25519-sha256; c=relaxed/relaxed; d=suse.de; s=susede2_ed25519; t=1777997374; h=from:from:reply-to: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=Cb7zHppTTTPuuYGVnbjALadsZfX5j2jgmG1ucp8x/24=; b=yNJFuCsmXzaa3/gbMe1P39fLddQl98UEkAsxuhwRh+NW08wDSalnXpVfe4U2U6RU3YeVz6 RAWw9ZqMb/Fg5cCg== From: Fabiano Rosas To: qemu-devel@nongnu.org Cc: Peter Xu , Lukas Straub , Laurent Vivier , Paolo Bonzini Subject: [PATCH v1 07/15] tests/qtest/migration: Defer by default in precopy_common Date: Tue, 5 May 2026 13:09:06 -0300 Message-ID: <20260505160915.25558-8-farosas@suse.de> X-Mailer: git-send-email 2.51.0 In-Reply-To: <20260505160915.25558-1-farosas@suse.de> References: <20260505160915.25558-1-farosas@suse.de> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable X-Spamd-Result: default: False [-2.80 / 50.00]; BAYES_HAM(-3.00)[100.00%]; NEURAL_HAM_LONG(-1.00)[-1.000]; MID_CONTAINS_FROM(1.00)[]; R_MISSING_CHARSET(0.50)[]; NEURAL_HAM_SHORT(-0.20)[-1.000]; MIME_GOOD(-0.10)[text/plain]; TO_MATCH_ENVRCPT_ALL(0.00)[]; ARC_NA(0.00)[]; RCVD_VIA_SMTP_AUTH(0.00)[]; FREEMAIL_CC(0.00)[redhat.com,web.de]; TO_DN_SOME(0.00)[]; MIME_TRACE(0.00)[0:+]; DBL_BLOCKED_OPENRESOLVER(0.00)[imap1.dmz-prg2.suse.org:helo,suse.de:mid,suse.de:email]; FUZZY_RATELIMITED(0.00)[rspamd.com]; FROM_HAS_DN(0.00)[]; RCVD_COUNT_TWO(0.00)[2]; RCVD_TLS_ALL(0.00)[]; FROM_EQ_ENVFROM(0.00)[]; RCPT_COUNT_FIVE(0.00)[5]; DKIM_SIGNED(0.00)[suse.de:s=susede2_rsa,suse.de:s=susede2_ed25519]; FREEMAIL_ENVRCPT(0.00)[web.de] X-Spam-Score: -2.80 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=lists1p.gnu.org; Received-SPF: pass client-ip=195.135.223.130; envelope-from=farosas@suse.de; helo=smtp-out1.suse.de X-Spam_score_int: -43 X-Spam_score: -4.4 X-Spam_bar: ---- X-Spam_report: (-4.4 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_MED=-2.3, SPF_HELO_NONE=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 @suse.de) X-ZM-MESSAGEID: 1777997549252154100 Content-Type: text/plain; charset="utf-8" As a design direction, we're restricting the usage of the command line option -incoming . The alternative -incoming defer should be used instead. Make all precopy_common tests defer by default. Using the defer option means that QEMU will not start the incoming migration automatically. Add the incoming QMP command. With the added command, the invocation at the multifd_common hook becomes redundant, so remove it. Signed-off-by: Fabiano Rosas Reviewed-by: Lukas Straub Reviewed-by: Peter Xu Tested-by: Lukas Straub --- tests/qtest/migration/colo-tests.c | 12 ++++-------- tests/qtest/migration/compression-tests.c | 6 ------ tests/qtest/migration/framework.c | 15 ++++++++------- tests/qtest/migration/precopy-tests.c | 11 +---------- tests/qtest/migration/tls-tests.c | 15 +-------------- 5 files changed, 14 insertions(+), 45 deletions(-) diff --git a/tests/qtest/migration/colo-tests.c b/tests/qtest/migration/col= o-tests.c index ef880f5114..4add4a014b 100644 --- a/tests/qtest/migration/colo-tests.c +++ b/tests/qtest/migration/colo-tests.c @@ -45,7 +45,7 @@ static int test_colo_common(MigrateCommon *args, args->start.caps[MIGRATION_CAPABILITY_RETURN_PATH] =3D true; args->start.caps[MIGRATION_CAPABILITY_X_COLO] =3D true; =20 - if (migrate_start(&from, &to, args->listen_uri, &args->start)) { + if (migrate_start(&from, &to, "defer", &args->start)) { return -1; } =20 @@ -55,6 +55,8 @@ static int test_colo_common(MigrateCommon *args, data_hook =3D args->start_hook(from, to); } =20 + migrate_incoming_qmp(to, args->listen_uri, NULL, "{}"); + migrate_ensure_converge(from); wait_for_serial("src_serial"); =20 @@ -107,17 +109,11 @@ static void test_colo_plain_common(MigrateCommon *arg= s, test_colo_common(args, failover_during_checkpoint, primary_failover); } =20 -static void *hook_start_multifd(QTestState *from, QTestState *to) -{ - return migrate_hook_start_precopy_tcp_multifd_common(from, to, "none"); -} - static void test_colo_multifd_common(MigrateCommon *args, bool failover_during_checkpoint, bool primary_failover) { - args->listen_uri =3D "defer"; - args->start_hook =3D hook_start_multifd; + args->listen_uri =3D "tcp:127.0.0.1:0"; args->start.caps[MIGRATION_CAPABILITY_MULTIFD] =3D true; test_colo_common(args, failover_during_checkpoint, primary_failover); } diff --git a/tests/qtest/migration/compression-tests.c b/tests/qtest/migrat= ion/compression-tests.c index 7f2856b7f8..134bf44db6 100644 --- a/tests/qtest/migration/compression-tests.c +++ b/tests/qtest/migration/compression-tests.c @@ -33,7 +33,6 @@ migrate_hook_start_precopy_tcp_multifd_zstd(QTestState *f= rom, =20 static void test_multifd_tcp_zstd(char *name, MigrateCommon *args) { - args->listen_uri =3D "defer"; args->start_hook =3D migrate_hook_start_precopy_tcp_multifd_zstd; =20 args->start.caps[MIGRATION_CAPABILITY_MULTIFD] =3D true; @@ -43,7 +42,6 @@ static void test_multifd_tcp_zstd(char *name, MigrateComm= on *args) =20 static void test_multifd_postcopy_tcp_zstd(char *name, MigrateCommon *args) { - args->listen_uri =3D "defer"; args->start_hook =3D migrate_hook_start_precopy_tcp_multifd_zstd, =20 args->start.caps[MIGRATION_CAPABILITY_MULTIFD] =3D true; @@ -66,7 +64,6 @@ migrate_hook_start_precopy_tcp_multifd_qatzip(QTestState = *from, =20 static void test_multifd_tcp_qatzip(char *name, MigrateCommon *args) { - args->listen_uri =3D "defer"; args->start_hook =3D migrate_hook_start_precopy_tcp_multifd_qatzip; =20 args->start.caps[MIGRATION_CAPABILITY_MULTIFD] =3D true; @@ -85,7 +82,6 @@ migrate_hook_start_precopy_tcp_multifd_qpl(QTestState *fr= om, =20 static void test_multifd_tcp_qpl(char *name, MigrateCommon *args) { - args->listen_uri =3D "defer"; args->start_hook =3D migrate_hook_start_precopy_tcp_multifd_qpl; =20 args->start.caps[MIGRATION_CAPABILITY_MULTIFD] =3D true; @@ -104,7 +100,6 @@ migrate_hook_start_precopy_tcp_multifd_uadk(QTestState = *from, =20 static void test_multifd_tcp_uadk(char *name, MigrateCommon *args) { - args->listen_uri =3D "defer"; args->start_hook =3D migrate_hook_start_precopy_tcp_multifd_uadk; =20 args->start.caps[MIGRATION_CAPABILITY_MULTIFD] =3D true; @@ -152,7 +147,6 @@ migrate_hook_start_precopy_tcp_multifd_zlib(QTestState = *from, =20 static void test_multifd_tcp_zlib(char *name, MigrateCommon *args) { - args->listen_uri =3D "defer"; args->start_hook =3D migrate_hook_start_precopy_tcp_multifd_zlib; =20 args->start.caps[MIGRATION_CAPABILITY_MULTIFD] =3D true; diff --git a/tests/qtest/migration/framework.c b/tests/qtest/migration/fram= ework.c index b77889de7f..f9f16faee4 100644 --- a/tests/qtest/migration/framework.c +++ b/tests/qtest/migration/framework.c @@ -834,11 +834,15 @@ int test_precopy_common(MigrateCommon *args) void *data_hook =3D NULL; QObject *channels =3D NULL; =20 - if (!args->listen_uri) { + assert(!args->connect_uri); + + if (args->listen_uri) { + args->connect_uri =3D args->listen_uri; + } else { args->listen_uri =3D "tcp:127.0.0.1:0"; } =20 - if (migrate_start(&from, &to, args->listen_uri, &args->start)) { + if (migrate_start(&from, &to, "defer", &args->start)) { return -1; } =20 @@ -846,6 +850,8 @@ int test_precopy_common(MigrateCommon *args) data_hook =3D args->start_hook(from, to); } =20 + migrate_incoming_qmp(to, args->listen_uri, NULL, "{}"); + /* Wait for the first serial output from the source */ if (args->result =3D=3D MIG_TEST_SUCCEED) { wait_for_serial("src_serial"); @@ -943,7 +949,6 @@ void test_precopy_unix_common(MigrateCommon *args) g_autofree char *uri =3D g_strdup_printf("unix:%s/migsocket", tmpfs); =20 args->listen_uri =3D uri; - args->connect_uri =3D uri; test_precopy_common(args); } =20 @@ -1064,10 +1069,6 @@ void *migrate_hook_start_precopy_tcp_multifd_common(= QTestState *from, { migrate_set_parameter_str(from, "multifd-compression", method); migrate_set_parameter_str(to, "multifd-compression", method); - - /* Start incoming migration from the 1st socket */ - migrate_incoming_qmp(to, "tcp:127.0.0.1:0", NULL, "{}"); - return NULL; } =20 diff --git a/tests/qtest/migration/precopy-tests.c b/tests/qtest/migration/= precopy-tests.c index 0d538bcd1a..05e5bee48d 100644 --- a/tests/qtest/migration/precopy-tests.c +++ b/tests/qtest/migration/precopy-tests.c @@ -162,7 +162,6 @@ static void __test_precopy_rdma_plain(MigrateCommon *ar= gs, bool ipv6) g_autofree char *uri =3D g_strdup_printf("rdma:%s:29200", buffer); =20 args->listen_uri =3D uri; - args->connect_uri =3D uri; =20 test_precopy_common(args); } @@ -214,9 +213,6 @@ static void *migrate_hook_start_fd(QTestState *from, " 'arguments': { 'fdname': 'fd-mig' }}"); close(pair[0]); =20 - /* Start incoming migration from the 1st socket */ - migrate_incoming_qmp(to, "fd:fd-mig", NULL, "{}"); - /* Send the 2nd socket to the target */ qtest_qmp_fds_assert_success(from, &pair[1], 1, "{ 'execute': 'getfd'," @@ -257,8 +253,7 @@ static void migrate_hook_end_fd(QTestState *from, =20 static void test_precopy_fd_socket(char *name, MigrateCommon *args) { - args->listen_uri =3D "defer"; - args->connect_uri =3D "fd:fd-mig"; + args->listen_uri =3D "fd:fd-mig"; args->start_hook =3D migrate_hook_start_fd; args->end_hook =3D migrate_hook_end_fd; =20 @@ -410,7 +405,6 @@ migrate_hook_start_precopy_tcp_multifd_no_zero_page(QTe= stState *from, =20 static void test_multifd_tcp_uri_none(char *name, MigrateCommon *args) { - args->listen_uri =3D "defer"; args->start_hook =3D migrate_hook_start_precopy_tcp_multifd; /* * Multifd is more complicated than most of the features, it @@ -426,7 +420,6 @@ static void test_multifd_tcp_uri_none(char *name, Migra= teCommon *args) =20 static void test_multifd_tcp_zero_page_legacy(char *name, MigrateCommon *a= rgs) { - args->listen_uri =3D "defer"; args->start_hook =3D migrate_hook_start_precopy_tcp_multifd_zero_page_= legacy; /* * Multifd is more complicated than most of the features, it @@ -442,7 +435,6 @@ static void test_multifd_tcp_zero_page_legacy(char *nam= e, MigrateCommon *args) =20 static void test_multifd_tcp_no_zero_page(char *name, MigrateCommon *args) { - args->listen_uri =3D "defer"; args->start_hook =3D migrate_hook_start_precopy_tcp_multifd_no_zero_pa= ge; /* * Multifd is more complicated than most of the features, it @@ -458,7 +450,6 @@ static void test_multifd_tcp_no_zero_page(char *name, M= igrateCommon *args) =20 static void test_multifd_tcp_channels_none(char *name, MigrateCommon *args) { - args->listen_uri =3D "defer"; args->start_hook =3D migrate_hook_start_precopy_tcp_multifd; args->live =3D true; args->connect_channels =3D ("[ { 'channel-type': 'main'," diff --git a/tests/qtest/migration/tls-tests.c b/tests/qtest/migration/tls-= tests.c index 4a3c404349..275d0b84d4 100644 --- a/tests/qtest/migration/tls-tests.c +++ b/tests/qtest/migration/tls-tests.c @@ -436,8 +436,7 @@ static void test_precopy_unix_tls_x509_default_host(cha= r *name, { g_autofree char *uri =3D g_strdup_printf("unix:%s/migsocket", tmpfs); =20 - args->connect_uri =3D uri; - args->listen_uri =3D "defer"; + args->listen_uri =3D uri; args->start_hook =3D migrate_hook_start_tls_x509_default_host; args->end_hook =3D migrate_hook_end_tls_x509; args->result =3D MIG_TEST_FAIL; @@ -511,8 +510,6 @@ migrate_hook_start_tls_x509_no_host(QTestState *from, Q= TestState *to) =20 static void test_precopy_tcp_tls_no_hostname(char *name, MigrateCommon *ar= gs) { - args->listen_uri =3D "defer"; - args->connect_uri =3D "tcp:127.0.0.1:0"; args->start_hook =3D migrate_hook_start_tls_x509_no_host; args->end_hook =3D migrate_hook_end_tls_x509; args->result =3D MIG_TEST_FAIL; @@ -544,8 +541,6 @@ static void test_precopy_tcp_tls_x509_override_host(cha= r *name, static void test_precopy_tcp_tls_x509_mismatch_host(char *name, MigrateCommon *args) { - args->listen_uri =3D "defer"; - args->connect_uri =3D "tcp:127.0.0.1:0"; args->start_hook =3D migrate_hook_start_tls_x509_mismatch_host; args->end_hook =3D migrate_hook_end_tls_x509; args->result =3D MIG_TEST_FAIL; @@ -658,7 +653,6 @@ migrate_hook_start_multifd_tls_x509_reject_anon_client(= QTestState *from, =20 static void test_multifd_tcp_tls_psk_match(char *name, MigrateCommon *args) { - args->listen_uri =3D "defer"; args->start_hook =3D migrate_hook_start_multifd_tcp_tls_psk_match; args->end_hook =3D migrate_hook_end_tls_psk; =20 @@ -669,7 +663,6 @@ static void test_multifd_tcp_tls_psk_match(char *name, = MigrateCommon *args) =20 static void test_multifd_tcp_tls_psk_mismatch(char *name, MigrateCommon *a= rgs) { - args->listen_uri =3D "defer"; args->start_hook =3D migrate_hook_start_multifd_tcp_tls_psk_mismatch; args->end_hook =3D migrate_hook_end_tls_psk; args->result =3D MIG_TEST_FAIL; @@ -683,7 +676,6 @@ static void test_multifd_tcp_tls_psk_mismatch(char *nam= e, MigrateCommon *args) static void test_multifd_postcopy_tcp_tls_psk_match(char *name, MigrateCommon *args) { - args->listen_uri =3D "defer"; args->start_hook =3D migrate_hook_start_multifd_tcp_tls_psk_match; args->end_hook =3D migrate_hook_end_tls_psk; =20 @@ -697,7 +689,6 @@ static void test_multifd_postcopy_tcp_tls_psk_match(cha= r *name, static void test_multifd_tcp_tls_x509_default_host(char *name, MigrateCommon *args) { - args->listen_uri =3D "defer"; args->start_hook =3D migrate_hook_start_multifd_tls_x509_default_host; args->end_hook =3D migrate_hook_end_tls_x509; =20 @@ -709,7 +700,6 @@ static void test_multifd_tcp_tls_x509_default_host(char= *name, static void test_multifd_tcp_tls_x509_override_host(char *name, MigrateCommon *args) { - args->listen_uri =3D "defer"; args->start_hook =3D migrate_hook_start_multifd_tls_x509_override_host; args->end_hook =3D migrate_hook_end_tls_x509; =20 @@ -734,7 +724,6 @@ static void test_multifd_tcp_tls_x509_mismatch_host(cha= r *name, * to load migration state, and thus just aborts the migration * without exiting. */ - args->listen_uri =3D "defer"; args->start_hook =3D migrate_hook_start_multifd_tls_x509_mismatch_host; args->end_hook =3D migrate_hook_end_tls_x509; args->result =3D MIG_TEST_FAIL; @@ -748,7 +737,6 @@ static void test_multifd_tcp_tls_x509_mismatch_host(cha= r *name, static void test_multifd_tcp_tls_x509_allow_anon_client(char *name, MigrateCommon *arg= s) { - args->listen_uri =3D "defer"; args->start_hook =3D migrate_hook_start_multifd_tls_x509_allow_anon_cl= ient; args->end_hook =3D migrate_hook_end_tls_x509; =20 @@ -760,7 +748,6 @@ static void test_multifd_tcp_tls_x509_allow_anon_client= (char *name, static void test_multifd_tcp_tls_x509_reject_anon_client(char *name, MigrateCommon *ar= gs) { - args->listen_uri =3D "defer"; args->start_hook =3D migrate_hook_start_multifd_tls_x509_reject_anon_c= lient; args->end_hook =3D migrate_hook_end_tls_x509; args->result =3D MIG_TEST_FAIL; --=20 2.51.0 From nobody Tue May 26 12:01:12 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=suse.de ARC-Seal: i=1; a=rsa-sha256; t=1777997467; cv=none; d=zohomail.com; s=zohoarc; b=Sre0zugBmDp+RbdhPvEJoH1zKaHhCX81Ex4L2+dC1oab5xfDU7tbxaUuch+WhyEt5HoECLPBPFB4WzOYZ7Ue7J0RPzOnT1L/KV55R+O4wk4Pyxvv+jj93/Pqrhow9EWbpPnQyIl8T6e+l7iSf56pBKXt5aeoVU7pMMxhORT7L4U= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1777997467; 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=oOXl+Kg4Ekn8eRhNqDeLTfbVre71RRbBJww/DujlEyo=; b=J/MTdEsqIy/4sDqADtGD1nagmE4ytZwEfyf4PINLGV4LCjTSKiXttjFCuds9NiODWYQC8XB3vNxxqnWUpkIRMqhjMaeNoVgZTA4Dg4D1SP8LI31utF+KQGj5ydNW7BqOg8alkT8tgXwymcjKJrWO8/tviF7XbYOppreuPLf4Nu0= 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 lists1p.gnu.org (lists1p.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1777997467677759.8182141378062; Tue, 5 May 2026 09:11:07 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists1p.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1wKIMG-00004w-Gh; Tue, 05 May 2026 12:10:52 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists1p.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1wKIM0-0008GP-FD for qemu-devel@nongnu.org; Tue, 05 May 2026 12:10:37 -0400 Received: from smtp-out1.suse.de ([2a07:de40:b251:101:10:150:64:1]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1wKILv-0000ZE-Q1 for qemu-devel@nongnu.org; Tue, 05 May 2026 12:10:36 -0400 Received: from imap1.dmz-prg2.suse.org (imap1.dmz-prg2.suse.org [IPv6:2a07:de40:b281:104:10:150:64:97]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by smtp-out1.suse.de (Postfix) with ESMTPS id EA4B66B767; Tue, 5 May 2026 16:09:35 +0000 (UTC) Received: from imap1.dmz-prg2.suse.org (localhost [127.0.0.1]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by imap1.dmz-prg2.suse.org (Postfix) with ESMTPS id C79C5593A3; Tue, 5 May 2026 16:09:34 +0000 (UTC) Received: from dovecot-director2.suse.de ([2a07:de40:b281:106:10:150:64:167]) by imap1.dmz-prg2.suse.org with ESMTPSA id iDGUJT4W+mmNcgAAD6G6ig (envelope-from ); Tue, 05 May 2026 16:09:34 +0000 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=suse.de; s=susede2_rsa; t=1777997376; h=from:from:reply-to: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=oOXl+Kg4Ekn8eRhNqDeLTfbVre71RRbBJww/DujlEyo=; b=wNFLsscelt0/z5quOYMs2eiDNKSVaun+tvxiNnnnAnMKnN60N1gRytA4BGTg/khbIWHld4 CDepdQjoSr9JtdoKCwIaTjf1yYCjem6x9mTSrmYYaiywLzDm7EUvVVRta7n8i97nEyt4i6 xLsRggUTFouo+ZXX++gfR4trCQbM6Zg= DKIM-Signature: v=1; a=ed25519-sha256; c=relaxed/relaxed; d=suse.de; s=susede2_ed25519; t=1777997376; h=from:from:reply-to: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=oOXl+Kg4Ekn8eRhNqDeLTfbVre71RRbBJww/DujlEyo=; b=xJ6u2P742M/joxUWfi0TiWhMZ9EzKxem/b1pfKa8uwdKm+jwAgvbPWThJeYnaoOlRipBR9 pUtMHyYE5YkIREAA== Authentication-Results: smtp-out1.suse.de; dkim=pass header.d=suse.de header.s=susede2_rsa header.b=k7l+D8pF; dkim=pass header.d=suse.de header.s=susede2_ed25519 header.b="w5m/Yzqq" DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=suse.de; s=susede2_rsa; t=1777997375; h=from:from:reply-to: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=oOXl+Kg4Ekn8eRhNqDeLTfbVre71RRbBJww/DujlEyo=; b=k7l+D8pFf4CYcVR6ok27xnEZ9vJJOopa0mkQYt6oLR6VYb0hrSp7M8qTFJzCtfO/NnAg2q uZiSV02Bq53wzG3DNK0YM72D7HbLe34kUJhDJNy9SIVCQnqjQ/FzoxTN05NQKdmMcx0jIi aLMDSfOl+ucMlIri2MQMor9AiurIWY0= DKIM-Signature: v=1; a=ed25519-sha256; c=relaxed/relaxed; d=suse.de; s=susede2_ed25519; t=1777997375; h=from:from:reply-to: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=oOXl+Kg4Ekn8eRhNqDeLTfbVre71RRbBJww/DujlEyo=; b=w5m/YzqqPu1ktmIO+1tCTwePhdQEjrYHotPUGQ/VNhrW0xyN7lap1WvIuVIb7rUpo7lRbS YabHz6RtksXMVEBg== From: Fabiano Rosas To: qemu-devel@nongnu.org Cc: Peter Xu , Laurent Vivier , Paolo Bonzini Subject: [PATCH v1 08/15] tests/qtest/migration: Set compression method in compression-tests Date: Tue, 5 May 2026 13:09:07 -0300 Message-ID: <20260505160915.25558-9-farosas@suse.de> X-Mailer: git-send-email 2.51.0 In-Reply-To: <20260505160915.25558-1-farosas@suse.de> References: <20260505160915.25558-1-farosas@suse.de> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable X-Rspamd-Action: no action X-Spamd-Result: default: False [-3.01 / 50.00]; BAYES_HAM(-3.00)[100.00%]; MID_CONTAINS_FROM(1.00)[]; NEURAL_HAM_LONG(-1.00)[-1.000]; R_MISSING_CHARSET(0.50)[]; R_DKIM_ALLOW(-0.20)[suse.de:s=susede2_rsa,suse.de:s=susede2_ed25519]; NEURAL_HAM_SHORT(-0.20)[-1.000]; MIME_GOOD(-0.10)[text/plain]; MX_GOOD(-0.01)[]; DBL_BLOCKED_OPENRESOLVER(0.00)[imap1.dmz-prg2.suse.org:rdns,imap1.dmz-prg2.suse.org:helo,suse.de:dkim,suse.de:email,suse.de:mid]; FROM_HAS_DN(0.00)[]; ARC_NA(0.00)[]; RCVD_VIA_SMTP_AUTH(0.00)[]; MIME_TRACE(0.00)[0:+]; SPAMHAUS_XBL(0.00)[2a07:de40:b281:104:10:150:64:97:from]; TO_DN_SOME(0.00)[]; TO_MATCH_ENVRCPT_ALL(0.00)[]; FUZZY_RATELIMITED(0.00)[rspamd.com]; FROM_EQ_ENVFROM(0.00)[]; DKIM_SIGNED(0.00)[suse.de:s=susede2_rsa,suse.de:s=susede2_ed25519]; DNSWL_BLOCKED(0.00)[2a07:de40:b281:106:10:150:64:167:received]; RCVD_COUNT_TWO(0.00)[2]; RCVD_TLS_ALL(0.00)[]; RCPT_COUNT_THREE(0.00)[4]; DKIM_TRACE(0.00)[suse.de:+] X-Rspamd-Queue-Id: EA4B66B767 X-Rspamd-Server: rspamd2.dmz-prg2.suse.org X-Spam-Score: -3.01 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=lists1p.gnu.org; Received-SPF: pass client-ip=2a07:de40:b251:101:10:150:64:1; envelope-from=farosas@suse.de; helo=smtp-out1.suse.de 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, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, SPF_HELO_NONE=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 @suse.de) (identity @suse.de) X-ZM-MESSAGEID: 1777997469267158500 Content-Type: text/plain; charset="utf-8" Stop calling a common function to set the multifd compression method. The default method is "none", so the common function is not necessary for tests that don't set compression and will be removed. Signed-off-by: Fabiano Rosas Reviewed-by: Peter Xu --- tests/qtest/migration/compression-tests.c | 22 +++++++++++++++++----- 1 file changed, 17 insertions(+), 5 deletions(-) diff --git a/tests/qtest/migration/compression-tests.c b/tests/qtest/migrat= ion/compression-tests.c index 134bf44db6..848576054f 100644 --- a/tests/qtest/migration/compression-tests.c +++ b/tests/qtest/migration/compression-tests.c @@ -20,6 +20,13 @@ =20 static char *tmpfs; =20 +static void set_multifd_compression(QTestState *from, QTestState *to, + const char *method) +{ + migrate_set_parameter_str(from, "multifd-compression", method); + migrate_set_parameter_str(to, "multifd-compression", method); +} + #ifdef CONFIG_ZSTD static void * migrate_hook_start_precopy_tcp_multifd_zstd(QTestState *from, @@ -27,8 +34,9 @@ migrate_hook_start_precopy_tcp_multifd_zstd(QTestState *f= rom, { migrate_set_parameter_int(from, "multifd-zstd-level", 2); migrate_set_parameter_int(to, "multifd-zstd-level", 2); + set_multifd_compression(from, to, "zstd"); =20 - return migrate_hook_start_precopy_tcp_multifd_common(from, to, "zstd"); + return NULL; } =20 static void test_multifd_tcp_zstd(char *name, MigrateCommon *args) @@ -58,8 +66,9 @@ migrate_hook_start_precopy_tcp_multifd_qatzip(QTestState = *from, { migrate_set_parameter_int(from, "multifd-qatzip-level", 2); migrate_set_parameter_int(to, "multifd-qatzip-level", 2); + set_multifd_compression(from, to, "qatzip"); =20 - return migrate_hook_start_precopy_tcp_multifd_common(from, to, "qatzip= "); + return NULL; } =20 static void test_multifd_tcp_qatzip(char *name, MigrateCommon *args) @@ -77,7 +86,8 @@ static void * migrate_hook_start_precopy_tcp_multifd_qpl(QTestState *from, QTestState *to) { - return migrate_hook_start_precopy_tcp_multifd_common(from, to, "qpl"); + set_multifd_compression(from, to, "qpl"); + return NULL; } =20 static void test_multifd_tcp_qpl(char *name, MigrateCommon *args) @@ -95,7 +105,8 @@ static void * migrate_hook_start_precopy_tcp_multifd_uadk(QTestState *from, QTestState *to) { - return migrate_hook_start_precopy_tcp_multifd_common(from, to, "uadk"); + set_multifd_compression(from, to, "uadk"); + return NULL; } =20 static void test_multifd_tcp_uadk(char *name, MigrateCommon *args) @@ -141,8 +152,9 @@ migrate_hook_start_precopy_tcp_multifd_zlib(QTestState = *from, */ migrate_set_parameter_int(from, "multifd-zlib-level", 2); migrate_set_parameter_int(to, "multifd-zlib-level", 2); + set_multifd_compression(from, to, "zlib"); =20 - return migrate_hook_start_precopy_tcp_multifd_common(from, to, "zlib"); + return NULL; } =20 static void test_multifd_tcp_zlib(char *name, MigrateCommon *args) --=20 2.51.0 From nobody Tue May 26 12:01:12 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=suse.de ARC-Seal: i=1; a=rsa-sha256; t=1777997537; cv=none; d=zohomail.com; s=zohoarc; b=kX27/AnwHoc4VkVxTKRkVEcRxxDW9pffpU1ZoYjPpPG33LxvhWN2Oazy+0ZonqvpcUNJ8+od3zNw2NgIWbIFG6JL16XeIA7aa9WkpC3QV+WL57FcxNnMU6Xtf13DncZM+K0hmtJqusyRBK1/LULL3kPRXU0d5VW6myLrfINwhqU= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1777997537; 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=8gLu8fyUzyQP1940vUaN/flGN80brylBhmoAkEaPaCE=; b=NxqWOtnV/9SDqJ5ZAuFl1t/bkIjF/P7+Fsw3GjixQ7Qxnza+Afzx6G3zknCaZmPwyaewUrKr/izK+qTtzw+WKCp3PC/iVbGv1tu3f/RKljJ15lcff07KjY/OaxvB42gb9CTKyDICgsHb/28MoPIe1aGbgRt9Q/zCaUyQsO8AzDA= 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 lists1p.gnu.org (lists1p.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1777997537391896.7913525052312; Tue, 5 May 2026 09:12:17 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists1p.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1wKIMH-00006K-Eq; Tue, 05 May 2026 12:10:53 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists1p.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1wKIM7-0008UG-Po for qemu-devel@nongnu.org; Tue, 05 May 2026 12:10:45 -0400 Received: from smtp-out1.suse.de ([195.135.223.130]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1wKIM4-0000p5-JG for qemu-devel@nongnu.org; Tue, 05 May 2026 12:10:42 -0400 Received: from imap1.dmz-prg2.suse.org (unknown [10.150.64.97]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by smtp-out1.suse.de (Postfix) with ESMTPS id 86ED76B785; Tue, 5 May 2026 16:09:37 +0000 (UTC) Received: from imap1.dmz-prg2.suse.org (localhost [127.0.0.1]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by imap1.dmz-prg2.suse.org (Postfix) with ESMTPS id 5DC59593A3; Tue, 5 May 2026 16:09:36 +0000 (UTC) Received: from dovecot-director2.suse.de ([2a07:de40:b281:106:10:150:64:167]) by imap1.dmz-prg2.suse.org with ESMTPSA id iIS6C0AW+mmNcgAAD6G6ig (envelope-from ); Tue, 05 May 2026 16:09:36 +0000 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=suse.de; s=susede2_rsa; t=1777997377; h=from:from:reply-to: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=8gLu8fyUzyQP1940vUaN/flGN80brylBhmoAkEaPaCE=; b=s8Pa5jjuHqS1aFVTYrcs2NnXiH8u4l+Wdm9FpDE1EGszi0Aasf3zn/w0V9uyqvIC37MsWx KM6aULGLY5dRVUhYm31J5ZyJ5epsLN/G82GA5IFrzc4PsU82h5UtQxzbu426YErDbFHkaE yWJPCRT9CDkNj+aUNcS8XUS7t/DuCQ8= DKIM-Signature: v=1; a=ed25519-sha256; c=relaxed/relaxed; d=suse.de; s=susede2_ed25519; t=1777997377; h=from:from:reply-to: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=8gLu8fyUzyQP1940vUaN/flGN80brylBhmoAkEaPaCE=; b=grnONh+cy7lzuYX9cfoFxwzcuLsYuk4h1DWkKz0k4qZSy/lCyuYk/b5QjZ52IXhS6fhtW4 WPt88c3eRdFuDQDg== Authentication-Results: smtp-out1.suse.de; none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=suse.de; s=susede2_rsa; t=1777997377; h=from:from:reply-to: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=8gLu8fyUzyQP1940vUaN/flGN80brylBhmoAkEaPaCE=; b=s8Pa5jjuHqS1aFVTYrcs2NnXiH8u4l+Wdm9FpDE1EGszi0Aasf3zn/w0V9uyqvIC37MsWx KM6aULGLY5dRVUhYm31J5ZyJ5epsLN/G82GA5IFrzc4PsU82h5UtQxzbu426YErDbFHkaE yWJPCRT9CDkNj+aUNcS8XUS7t/DuCQ8= DKIM-Signature: v=1; a=ed25519-sha256; c=relaxed/relaxed; d=suse.de; s=susede2_ed25519; t=1777997377; h=from:from:reply-to: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=8gLu8fyUzyQP1940vUaN/flGN80brylBhmoAkEaPaCE=; b=grnONh+cy7lzuYX9cfoFxwzcuLsYuk4h1DWkKz0k4qZSy/lCyuYk/b5QjZ52IXhS6fhtW4 WPt88c3eRdFuDQDg== From: Fabiano Rosas To: qemu-devel@nongnu.org Cc: Peter Xu , Laurent Vivier , Paolo Bonzini Subject: [PATCH v1 09/15] tests/qtest/migration: Remove multifd compression hook Date: Tue, 5 May 2026 13:09:08 -0300 Message-ID: <20260505160915.25558-10-farosas@suse.de> X-Mailer: git-send-email 2.51.0 In-Reply-To: <20260505160915.25558-1-farosas@suse.de> References: <20260505160915.25558-1-farosas@suse.de> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable X-Spamd-Result: default: False [-2.80 / 50.00]; BAYES_HAM(-3.00)[100.00%]; NEURAL_HAM_LONG(-1.00)[-1.000]; MID_CONTAINS_FROM(1.00)[]; R_MISSING_CHARSET(0.50)[]; NEURAL_HAM_SHORT(-0.20)[-1.000]; MIME_GOOD(-0.10)[text/plain]; TO_MATCH_ENVRCPT_ALL(0.00)[]; FROM_HAS_DN(0.00)[]; ARC_NA(0.00)[]; MIME_TRACE(0.00)[0:+]; TO_DN_SOME(0.00)[]; DBL_BLOCKED_OPENRESOLVER(0.00)[suse.de:mid,suse.de:email,imap1.dmz-prg2.suse.org:helo]; RCVD_VIA_SMTP_AUTH(0.00)[]; FROM_EQ_ENVFROM(0.00)[]; RCVD_COUNT_TWO(0.00)[2]; FUZZY_RATELIMITED(0.00)[rspamd.com]; DKIM_SIGNED(0.00)[suse.de:s=susede2_rsa,suse.de:s=susede2_ed25519]; RCPT_COUNT_THREE(0.00)[4]; RCVD_TLS_ALL(0.00)[] X-Spam-Score: -2.80 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=lists1p.gnu.org; Received-SPF: pass client-ip=195.135.223.130; envelope-from=farosas@suse.de; helo=smtp-out1.suse.de X-Spam_score_int: -43 X-Spam_score: -4.4 X-Spam_bar: ---- X-Spam_report: (-4.4 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_MED=-2.3, SPF_HELO_NONE=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 @suse.de) X-ZM-MESSAGEID: 1777997538783158500 Content-Type: text/plain; charset="utf-8" Take advantage of the default compression method for multifd being "none" and remove the common compression hook. Signed-off-by: Fabiano Rosas Reviewed-by: Peter Xu --- tests/qtest/migration/framework.c | 9 ---- tests/qtest/migration/framework.h | 3 -- tests/qtest/migration/precopy-tests.c | 11 ---- tests/qtest/migration/tls-tests.c | 74 +++------------------------ 4 files changed, 8 insertions(+), 89 deletions(-) diff --git a/tests/qtest/migration/framework.c b/tests/qtest/migration/fram= ework.c index f9f16faee4..9df33f8809 100644 --- a/tests/qtest/migration/framework.c +++ b/tests/qtest/migration/framework.c @@ -1063,15 +1063,6 @@ finish: migrate_end(from, to, args->result =3D=3D MIG_TEST_SUCCEED); } =20 -void *migrate_hook_start_precopy_tcp_multifd_common(QTestState *from, - QTestState *to, - const char *method) -{ - migrate_set_parameter_str(from, "multifd-compression", method); - migrate_set_parameter_str(to, "multifd-compression", method); - return NULL; -} - QTestMigrationState *get_src(void) { return &src_state; diff --git a/tests/qtest/migration/framework.h b/tests/qtest/migration/fram= ework.h index 613839dec8..7635e9fac1 100644 --- a/tests/qtest/migration/framework.h +++ b/tests/qtest/migration/framework.h @@ -241,9 +241,6 @@ void test_postcopy_recovery_common(MigrateCommon *args, int test_precopy_common(MigrateCommon *args); void test_precopy_unix_common(MigrateCommon *args); void test_file_common(MigrateCommon *args, bool stop_src); -void *migrate_hook_start_precopy_tcp_multifd_common(QTestState *from, - QTestState *to, - const char *method); =20 typedef struct QTestMigrationState QTestMigrationState; QTestMigrationState *get_src(void); diff --git a/tests/qtest/migration/precopy-tests.c b/tests/qtest/migration/= precopy-tests.c index 05e5bee48d..45a8f6d76c 100644 --- a/tests/qtest/migration/precopy-tests.c +++ b/tests/qtest/migration/precopy-tests.c @@ -378,18 +378,10 @@ static void test_auto_converge(char *name, MigrateCom= mon *args) migrate_end(from, to, true); } =20 -static void * -migrate_hook_start_precopy_tcp_multifd(QTestState *from, - QTestState *to) -{ - return migrate_hook_start_precopy_tcp_multifd_common(from, to, "none"); -} - static void * migrate_hook_start_precopy_tcp_multifd_zero_page_legacy(QTestState *from, QTestState *to) { - migrate_hook_start_precopy_tcp_multifd_common(from, to, "none"); migrate_set_parameter_str(from, "zero-page-detection", "legacy"); return NULL; } @@ -398,14 +390,12 @@ static void * migrate_hook_start_precopy_tcp_multifd_no_zero_page(QTestState *from, QTestState *to) { - migrate_hook_start_precopy_tcp_multifd_common(from, to, "none"); migrate_set_parameter_str(from, "zero-page-detection", "none"); return NULL; } =20 static void test_multifd_tcp_uri_none(char *name, MigrateCommon *args) { - args->start_hook =3D migrate_hook_start_precopy_tcp_multifd; /* * Multifd is more complicated than most of the features, it * directly takes guest page buffers when sending, make sure @@ -450,7 +440,6 @@ static void test_multifd_tcp_no_zero_page(char *name, M= igrateCommon *args) =20 static void test_multifd_tcp_channels_none(char *name, MigrateCommon *args) { - args->start_hook =3D migrate_hook_start_precopy_tcp_multifd; args->live =3D true; args->connect_channels =3D ("[ { 'channel-type': 'main'," " 'addr': { 'transport': 'socket'," diff --git a/tests/qtest/migration/tls-tests.c b/tests/qtest/migration/tls-= tests.c index 275d0b84d4..f45f4c4b0c 100644 --- a/tests/qtest/migration/tls-tests.c +++ b/tests/qtest/migration/tls-tests.c @@ -593,67 +593,9 @@ static void test_precopy_tcp_tls_x509_reject_anon_clie= nt(char *name, } #endif /* CONFIG_TASN1 */ =20 -static void * -migrate_hook_start_multifd_tcp_tls_psk_match(QTestState *from, - QTestState *to) -{ - migrate_hook_start_precopy_tcp_multifd_common(from, to, "none"); - return migrate_hook_start_tls_psk_match(from, to); -} - -static void * -migrate_hook_start_multifd_tcp_tls_psk_mismatch(QTestState *from, - QTestState *to) -{ - migrate_hook_start_precopy_tcp_multifd_common(from, to, "none"); - return migrate_hook_start_tls_psk_mismatch(from, to); -} - -#ifdef CONFIG_TASN1 -static void * -migrate_hook_start_multifd_tls_x509_default_host(QTestState *from, - QTestState *to) -{ - migrate_hook_start_precopy_tcp_multifd_common(from, to, "none"); - return migrate_hook_start_tls_x509_default_host(from, to); -} - -static void * -migrate_hook_start_multifd_tls_x509_override_host(QTestState *from, - QTestState *to) -{ - migrate_hook_start_precopy_tcp_multifd_common(from, to, "none"); - return migrate_hook_start_tls_x509_override_host(from, to); -} - -static void * -migrate_hook_start_multifd_tls_x509_mismatch_host(QTestState *from, - QTestState *to) -{ - migrate_hook_start_precopy_tcp_multifd_common(from, to, "none"); - return migrate_hook_start_tls_x509_mismatch_host(from, to); -} - -static void * -migrate_hook_start_multifd_tls_x509_allow_anon_client(QTestState *from, - QTestState *to) -{ - migrate_hook_start_precopy_tcp_multifd_common(from, to, "none"); - return migrate_hook_start_tls_x509_allow_anon_client(from, to); -} - -static void * -migrate_hook_start_multifd_tls_x509_reject_anon_client(QTestState *from, - QTestState *to) -{ - migrate_hook_start_precopy_tcp_multifd_common(from, to, "none"); - return migrate_hook_start_tls_x509_reject_anon_client(from, to); -} -#endif /* CONFIG_TASN1 */ - static void test_multifd_tcp_tls_psk_match(char *name, MigrateCommon *args) { - args->start_hook =3D migrate_hook_start_multifd_tcp_tls_psk_match; + args->start_hook =3D migrate_hook_start_tls_psk_match; args->end_hook =3D migrate_hook_end_tls_psk; =20 args->start.caps[MIGRATION_CAPABILITY_MULTIFD] =3D true; @@ -663,7 +605,7 @@ static void test_multifd_tcp_tls_psk_match(char *name, = MigrateCommon *args) =20 static void test_multifd_tcp_tls_psk_mismatch(char *name, MigrateCommon *a= rgs) { - args->start_hook =3D migrate_hook_start_multifd_tcp_tls_psk_mismatch; + args->start_hook =3D migrate_hook_start_tls_psk_mismatch; args->end_hook =3D migrate_hook_end_tls_psk; args->result =3D MIG_TEST_FAIL; =20 @@ -676,7 +618,7 @@ static void test_multifd_tcp_tls_psk_mismatch(char *nam= e, MigrateCommon *args) static void test_multifd_postcopy_tcp_tls_psk_match(char *name, MigrateCommon *args) { - args->start_hook =3D migrate_hook_start_multifd_tcp_tls_psk_match; + args->start_hook =3D migrate_hook_start_tls_psk_match; args->end_hook =3D migrate_hook_end_tls_psk; =20 args->start.caps[MIGRATION_CAPABILITY_MULTIFD] =3D true; @@ -689,7 +631,7 @@ static void test_multifd_postcopy_tcp_tls_psk_match(cha= r *name, static void test_multifd_tcp_tls_x509_default_host(char *name, MigrateCommon *args) { - args->start_hook =3D migrate_hook_start_multifd_tls_x509_default_host; + args->start_hook =3D migrate_hook_start_tls_x509_default_host; args->end_hook =3D migrate_hook_end_tls_x509; =20 args->start.caps[MIGRATION_CAPABILITY_MULTIFD] =3D true; @@ -700,7 +642,7 @@ static void test_multifd_tcp_tls_x509_default_host(char= *name, static void test_multifd_tcp_tls_x509_override_host(char *name, MigrateCommon *args) { - args->start_hook =3D migrate_hook_start_multifd_tls_x509_override_host; + args->start_hook =3D migrate_hook_start_tls_x509_override_host; args->end_hook =3D migrate_hook_end_tls_x509; =20 args->start.caps[MIGRATION_CAPABILITY_MULTIFD] =3D true; @@ -724,7 +666,7 @@ static void test_multifd_tcp_tls_x509_mismatch_host(cha= r *name, * to load migration state, and thus just aborts the migration * without exiting. */ - args->start_hook =3D migrate_hook_start_multifd_tls_x509_mismatch_host; + args->start_hook =3D migrate_hook_start_tls_x509_mismatch_host; args->end_hook =3D migrate_hook_end_tls_x509; args->result =3D MIG_TEST_FAIL; =20 @@ -737,7 +679,7 @@ static void test_multifd_tcp_tls_x509_mismatch_host(cha= r *name, static void test_multifd_tcp_tls_x509_allow_anon_client(char *name, MigrateCommon *arg= s) { - args->start_hook =3D migrate_hook_start_multifd_tls_x509_allow_anon_cl= ient; + args->start_hook =3D migrate_hook_start_tls_x509_allow_anon_client; args->end_hook =3D migrate_hook_end_tls_x509; =20 args->start.caps[MIGRATION_CAPABILITY_MULTIFD] =3D true; @@ -748,7 +690,7 @@ static void test_multifd_tcp_tls_x509_allow_anon_client= (char *name, static void test_multifd_tcp_tls_x509_reject_anon_client(char *name, MigrateCommon *ar= gs) { - args->start_hook =3D migrate_hook_start_multifd_tls_x509_reject_anon_c= lient; + args->start_hook =3D migrate_hook_start_tls_x509_reject_anon_client; args->end_hook =3D migrate_hook_end_tls_x509; args->result =3D MIG_TEST_FAIL; =20 --=20 2.51.0 From nobody Tue May 26 12:01:12 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=suse.de ARC-Seal: i=1; a=rsa-sha256; t=1777997537; cv=none; d=zohomail.com; s=zohoarc; b=iJMhA/CJt0EI6cxcYmZYG+rvtIV9hCwKwUTtOv1Ih8X6rNSYSLSisEmjPCrcZz1qbrtZ0MipkeQrlDDNqxqcPck+jYeslZg+5yq1Rp3zPEiL6e5MhtuJcCtX3SsDlf58uA1BWwtINX0rLuCmD4H0EAdkMqWWtr+jXMRIoAxh2/Q= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1777997537; 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=xnN4jGROF2Ag2stM9Gd8AphVtEE7AjlLZXIM5iuEbDQ=; b=m4tFQqD5TA9/eJnXpk2i4FdzhGfjq+DgE2EE6MblBU3Pz4CYy442j1Y/oeEkgnIvdvhH7zHMZpno6sPPOAliMfeYl+kRSjIIFv0P3sJGVEyqpNS+5LQFPCATz1iYeUyvdnqDJQTuabFaZo91LbimQoR94p6rDWEwzhkVmQmFzd8= 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 lists1p.gnu.org (lists1p.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1777997537939507.9160589120561; Tue, 5 May 2026 09:12:17 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists1p.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1wKIM4-0008Qf-Cn; Tue, 05 May 2026 12:10:40 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists1p.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1wKILJ-00080F-0L for qemu-devel@nongnu.org; Tue, 05 May 2026 12:09:54 -0400 Received: from smtp-out2.suse.de ([195.135.223.131]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1wKILG-00087c-K9 for qemu-devel@nongnu.org; Tue, 05 May 2026 12:09:52 -0400 Received: from imap1.dmz-prg2.suse.org (imap1.dmz-prg2.suse.org [IPv6:2a07:de40:b281:104:10:150:64:97]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by smtp-out2.suse.de (Postfix) with ESMTPS id 0FD945CAF0; Tue, 5 May 2026 16:09:39 +0000 (UTC) Received: from imap1.dmz-prg2.suse.org (localhost [127.0.0.1]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by imap1.dmz-prg2.suse.org (Postfix) with ESMTPS id E024B593A3; Tue, 5 May 2026 16:09:37 +0000 (UTC) Received: from dovecot-director2.suse.de ([2a07:de40:b281:106:10:150:64:167]) by imap1.dmz-prg2.suse.org with ESMTPSA id oHmNK0EW+mmNcgAAD6G6ig (envelope-from ); Tue, 05 May 2026 16:09:37 +0000 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=suse.de; s=susede2_rsa; t=1777997379; h=from:from:reply-to: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=xnN4jGROF2Ag2stM9Gd8AphVtEE7AjlLZXIM5iuEbDQ=; b=kjD5XLixtvbjcr7wEOrqnYeFaFkTyTke9aKHH4MrMM/g0agcJ+fjEKB9zx7UL3mPgj/2Mq Vhm5uHHZyMz1oAjqFH/uvqaEOC/riaVmeJK8N/R2NxelJjCP5sO8U+SYmciATsZ6Qo4Qzt iVQM5CYvEByZFKvY4zS1PoXXdS07ckE= DKIM-Signature: v=1; a=ed25519-sha256; c=relaxed/relaxed; d=suse.de; s=susede2_ed25519; t=1777997379; h=from:from:reply-to: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=xnN4jGROF2Ag2stM9Gd8AphVtEE7AjlLZXIM5iuEbDQ=; b=i9d3RemBjvuzSiZ4tWA7mWOGbIWiwv7nsHSmK5k6Yc4iNbA/iVWtf+J04TiasKfyN79s4G CSA/U9HxkFD4SRAQ== Authentication-Results: smtp-out2.suse.de; dkim=pass header.d=suse.de header.s=susede2_rsa header.b=kjD5XLix; dkim=pass header.d=suse.de header.s=susede2_ed25519 header.b=i9d3RemB DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=suse.de; s=susede2_rsa; t=1777997379; h=from:from:reply-to: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=xnN4jGROF2Ag2stM9Gd8AphVtEE7AjlLZXIM5iuEbDQ=; b=kjD5XLixtvbjcr7wEOrqnYeFaFkTyTke9aKHH4MrMM/g0agcJ+fjEKB9zx7UL3mPgj/2Mq Vhm5uHHZyMz1oAjqFH/uvqaEOC/riaVmeJK8N/R2NxelJjCP5sO8U+SYmciATsZ6Qo4Qzt iVQM5CYvEByZFKvY4zS1PoXXdS07ckE= DKIM-Signature: v=1; a=ed25519-sha256; c=relaxed/relaxed; d=suse.de; s=susede2_ed25519; t=1777997379; h=from:from:reply-to: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=xnN4jGROF2Ag2stM9Gd8AphVtEE7AjlLZXIM5iuEbDQ=; b=i9d3RemBjvuzSiZ4tWA7mWOGbIWiwv7nsHSmK5k6Yc4iNbA/iVWtf+J04TiasKfyN79s4G CSA/U9HxkFD4SRAQ== From: Fabiano Rosas To: qemu-devel@nongnu.org Cc: Peter Xu , Laurent Vivier , Paolo Bonzini Subject: [PATCH v1 10/15] tests/qtest/migration: Use defer for all tests Date: Tue, 5 May 2026 13:09:09 -0300 Message-ID: <20260505160915.25558-11-farosas@suse.de> X-Mailer: git-send-email 2.51.0 In-Reply-To: <20260505160915.25558-1-farosas@suse.de> References: <20260505160915.25558-1-farosas@suse.de> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable X-Spam-Score: -3.01 X-Rspamd-Action: no action X-Spamd-Result: default: False [-3.01 / 50.00]; BAYES_HAM(-3.00)[100.00%]; MID_CONTAINS_FROM(1.00)[]; NEURAL_HAM_LONG(-1.00)[-1.000]; R_MISSING_CHARSET(0.50)[]; R_DKIM_ALLOW(-0.20)[suse.de:s=susede2_rsa,suse.de:s=susede2_ed25519]; NEURAL_HAM_SHORT(-0.20)[-1.000]; MIME_GOOD(-0.10)[text/plain]; MX_GOOD(-0.01)[]; TO_DN_SOME(0.00)[]; ARC_NA(0.00)[]; FUZZY_RATELIMITED(0.00)[rspamd.com]; SPAMHAUS_XBL(0.00)[2a07:de40:b281:104:10:150:64:97:from]; MIME_TRACE(0.00)[0:+]; RCVD_VIA_SMTP_AUTH(0.00)[]; DNSWL_BLOCKED(0.00)[2a07:de40:b281:106:10:150:64:167:received]; DKIM_SIGNED(0.00)[suse.de:s=susede2_rsa,suse.de:s=susede2_ed25519]; FROM_EQ_ENVFROM(0.00)[]; FROM_HAS_DN(0.00)[]; RCPT_COUNT_THREE(0.00)[4]; RCVD_TLS_ALL(0.00)[]; DBL_BLOCKED_OPENRESOLVER(0.00)[imap1.dmz-prg2.suse.org:rdns,imap1.dmz-prg2.suse.org:helo,suse.de:email,suse.de:dkim,suse.de:mid]; RCVD_COUNT_TWO(0.00)[2]; TO_MATCH_ENVRCPT_ALL(0.00)[]; DKIM_TRACE(0.00)[suse.de:+] X-Rspamd-Server: rspamd1.dmz-prg2.suse.org X-Rspamd-Queue-Id: 0FD945CAF0 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=lists1p.gnu.org; Received-SPF: pass client-ip=195.135.223.131; envelope-from=farosas@suse.de; helo=smtp-out2.suse.de X-Spam_score_int: -43 X-Spam_score: -4.4 X-Spam_bar: ---- X-Spam_report: (-4.4 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_MED=-2.3, SPF_HELO_NONE=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 @suse.de) X-ZM-MESSAGEID: 1777997538993154100 Content-Type: text/plain; charset="utf-8" Change all invocations of migrate_start to use defer. The uri parameter will be removed from that function in subsequent patches. Signed-off-by: Fabiano Rosas Reviewed-by: Peter Xu --- tests/qtest/migration/misc-tests.c | 14 ++++++++------ 1 file changed, 8 insertions(+), 6 deletions(-) diff --git a/tests/qtest/migration/misc-tests.c b/tests/qtest/migration/mis= c-tests.c index 8d1cd44183..8216b5d79d 100644 --- a/tests/qtest/migration/misc-tests.c +++ b/tests/qtest/migration/misc-tests.c @@ -28,9 +28,11 @@ static void test_baddest(char *name, MigrateCommon *args) =20 args->start.hide_stderr =3D true; =20 - if (migrate_start(&from, &to, "tcp:127.0.0.1:0", &args->start)) { + if (migrate_start(&from, &to, "defer", &args->start)) { return; } + + migrate_incoming_qmp(to, "tcp:127.0.0.1:0", NULL, "{}"); migrate_qmp(from, to, "tcp:127.0.0.1:0", NULL, "{}"); wait_for_migration_fail(from, false); migrate_end(from, to, false); @@ -52,8 +54,7 @@ static void test_analyze_script(char *name, MigrateCommon= *args) return; } =20 - /* dummy url */ - if (migrate_start(&from, &to, "tcp:127.0.0.1:0", &args->start)) { + if (migrate_start(&from, &to, "defer", &args->start)) { return; } =20 @@ -69,6 +70,7 @@ static void test_analyze_script(char *name, MigrateCommon= *args) uri =3D g_strdup_printf("exec:cat > %s", file); =20 migrate_ensure_converge(from); + migrate_incoming_qmp(to, "tcp:127.0.0.1:0", NULL, "{}"); migrate_qmp(from, to, uri, NULL, "{}"); wait_for_migration_complete(from); =20 @@ -178,13 +180,15 @@ static void do_test_validate_uri_channel(MigrateCommo= n *args) QTestState *from, *to; QObject *channels; =20 - if (migrate_start(&from, &to, args->listen_uri, &args->start)) { + if (migrate_start(&from, &to, "defer", &args->start)) { return; } =20 /* Wait for the first serial output from the source */ wait_for_serial("src_serial"); =20 + migrate_incoming_qmp(to, "tcp:127.0.0.1:0", NULL, "{}"); + /* * 'uri' and 'channels' validation is checked even before the migration * starts. @@ -248,7 +252,6 @@ static void test_validate_caps_pair(char *test_path, Mi= grateCommon *args) =20 static void test_validate_uri_channels_both_set(char *name, MigrateCommon = *args) { - args->listen_uri =3D "defer", args->connect_uri =3D "tcp:127.0.0.1:0", args->connect_channels =3D ("[ { ""'channel-type': 'main'," " 'addr': { 'transport': 'socket'," @@ -263,7 +266,6 @@ static void test_validate_uri_channels_both_set(char *n= ame, MigrateCommon *args) =20 static void test_validate_uri_channels_none_set(char *name, MigrateCommon = *args) { - args->listen_uri =3D "defer"; args->start.hide_stderr =3D true; =20 do_test_validate_uri_channel(args); --=20 2.51.0 From nobody Tue May 26 12:01:12 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=suse.de ARC-Seal: i=1; a=rsa-sha256; t=1777997544; cv=none; d=zohomail.com; s=zohoarc; b=EE/eH0W6ekjZgoRpmXpKk6F9mZmvXbEWsPqHrWLFPEnkcsiCplbuq1Nl4hpqq31e4I6Yil0AA/Gyl1Rv+6cnMcf9cRe4sDAmpzHUytQuG/dmas+unSXb+RfBmAXmC0rFrxaqHmqtGC6aMFUNxKXVdfbvPB0hpOgKZzoaSvMtAz0= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1777997544; 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=cwwElCK9k5QjFlI9gwF3UliZW/jwsyovdsQXl4dDoH4=; b=huABk5ILh2NQn/rxs7HcBmtKBD+4maDsi0faTC8rq6gnEbuolKEiB5wP6rtwFlw+aTfpylb7FzVzZWiN1s3UBIRcf1/ChgZi23x7z8CNxo3fLR+Jm8jOz4myZoC5z/b9EgxEmcnyo1UgYHQXuw+NxlBwh8fg/36VFkcMeAFqGu0= 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 lists1p.gnu.org (lists1p.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1777997544418515.3192717516707; Tue, 5 May 2026 09:12:24 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists1p.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1wKIMI-00007i-BJ; Tue, 05 May 2026 12:10:54 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists1p.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1wKIMD-0008VS-Re for qemu-devel@nongnu.org; Tue, 05 May 2026 12:10:51 -0400 Received: from smtp-out1.suse.de ([195.135.223.130]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1wKIMC-0000ur-2h for qemu-devel@nongnu.org; Tue, 05 May 2026 12:10:49 -0400 Received: from imap1.dmz-prg2.suse.org (unknown [10.150.64.97]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by smtp-out1.suse.de (Postfix) with ESMTPS id EE7DE6B768; Tue, 5 May 2026 16:09:40 +0000 (UTC) Received: from imap1.dmz-prg2.suse.org (localhost [127.0.0.1]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by imap1.dmz-prg2.suse.org (Postfix) with ESMTPS id 6F317593A3; Tue, 5 May 2026 16:09:39 +0000 (UTC) Received: from dovecot-director2.suse.de ([2a07:de40:b281:106:10:150:64:167]) by imap1.dmz-prg2.suse.org with ESMTPSA id qATuD0MW+mmNcgAAD6G6ig (envelope-from ); Tue, 05 May 2026 16:09:39 +0000 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=suse.de; s=susede2_rsa; t=1777997381; h=from:from:reply-to: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=cwwElCK9k5QjFlI9gwF3UliZW/jwsyovdsQXl4dDoH4=; b=VouiTrpDBYh4VeQ8kTouULVnu5o0T+BMj6okkBxg4JwYOrWkfmlTxAWzwApOfKVLd7N5Xu 16/LdvcmYOPfyVjhMsVOhviZMjZtNq8E+hz9JGSqdKvhqG6QWQOvzRbnrln1d7Al4WY5Q5 RtIRRs6zDFyZYjfXUvSNF1nxw0KuJeQ= DKIM-Signature: v=1; a=ed25519-sha256; c=relaxed/relaxed; d=suse.de; s=susede2_ed25519; t=1777997381; h=from:from:reply-to: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=cwwElCK9k5QjFlI9gwF3UliZW/jwsyovdsQXl4dDoH4=; b=NY0kqIOoN23b6D2ESE5/f/X6psUEm69kOdnAsqj1i5jPg2qIPf0CfkMAvAxn/+TwYIPvEF q5RPJH6ikBgFSgAA== Authentication-Results: smtp-out1.suse.de; none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=suse.de; s=susede2_rsa; t=1777997380; h=from:from:reply-to: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=cwwElCK9k5QjFlI9gwF3UliZW/jwsyovdsQXl4dDoH4=; b=nF25N6Gb6UerP3kmxCGfe3ZlVj8STI9RugfyesZC7plG0ApA1vK9MAqIeVwDYulKjj2JR8 xQbtCIIJs6X0isVgvhUGZ/VoCjhxz/FiIOh/QdU1qPTs8ibOq1QIhTfELO79pwtzuD9ZpE mVSP5lIV0+LFGiAko0WyEMGukaTyQR4= DKIM-Signature: v=1; a=ed25519-sha256; c=relaxed/relaxed; d=suse.de; s=susede2_ed25519; t=1777997380; h=from:from:reply-to: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=cwwElCK9k5QjFlI9gwF3UliZW/jwsyovdsQXl4dDoH4=; b=hEiVQAbmVNJn3TNIe43yZlSowyb1iCLY62mT7d+LOiJPwDWdfa3yT5IIBnmXfpJtarLlMN jXw9RZLCoCBf2FBQ== From: Fabiano Rosas To: qemu-devel@nongnu.org Cc: Peter Xu , Mark Kanda , Ben Chaney , Laurent Vivier , Paolo Bonzini Subject: [PATCH v1 11/15] tests/qtest/migration: Use defer for cpr-tests Date: Tue, 5 May 2026 13:09:10 -0300 Message-ID: <20260505160915.25558-12-farosas@suse.de> X-Mailer: git-send-email 2.51.0 In-Reply-To: <20260505160915.25558-1-farosas@suse.de> References: <20260505160915.25558-1-farosas@suse.de> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable X-Spam-Score: -2.80 X-Spamd-Result: default: False [-2.80 / 50.00]; BAYES_HAM(-3.00)[100.00%]; NEURAL_HAM_LONG(-1.00)[-1.000]; MID_CONTAINS_FROM(1.00)[]; R_MISSING_CHARSET(0.50)[]; NEURAL_HAM_SHORT(-0.20)[-1.000]; MIME_GOOD(-0.10)[text/plain]; TO_MATCH_ENVRCPT_ALL(0.00)[]; FROM_HAS_DN(0.00)[]; ARC_NA(0.00)[]; MIME_TRACE(0.00)[0:+]; TO_DN_SOME(0.00)[]; DBL_BLOCKED_OPENRESOLVER(0.00)[imap1.dmz-prg2.suse.org:helo,suse.de:email,suse.de:mid]; RCVD_VIA_SMTP_AUTH(0.00)[]; FROM_EQ_ENVFROM(0.00)[]; RCVD_COUNT_TWO(0.00)[2]; FUZZY_RATELIMITED(0.00)[rspamd.com]; DKIM_SIGNED(0.00)[suse.de:s=susede2_rsa,suse.de:s=susede2_ed25519]; RCPT_COUNT_FIVE(0.00)[6]; RCVD_TLS_ALL(0.00)[] 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=lists1p.gnu.org; Received-SPF: pass client-ip=195.135.223.130; envelope-from=farosas@suse.de; helo=smtp-out1.suse.de X-Spam_score_int: -43 X-Spam_score: -4.4 X-Spam_bar: ---- X-Spam_report: (-4.4 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_MED=-2.3, SPF_HELO_NONE=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 @suse.de) (identity @suse.de) X-ZM-MESSAGEID: 1777997544942158500 Content-Type: text/plain; charset="utf-8" Signed-off-by: Fabiano Rosas Reviewed-by: Peter Xu --- tests/qtest/migration/cpr-tests.c | 21 ++++++++++++--------- 1 file changed, 12 insertions(+), 9 deletions(-) diff --git a/tests/qtest/migration/cpr-tests.c b/tests/qtest/migration/cpr-= tests.c index 18217f0460..9091a84213 100644 --- a/tests/qtest/migration/cpr-tests.c +++ b/tests/qtest/migration/cpr-tests.c @@ -60,7 +60,7 @@ static int test_transfer(MigrateCommon *args, const char = *cpr_channel, obj =3D migrate_str_to_channel(cpr_channel); qlist_append(channels_list, obj); =20 - if (migrate_start(&from, &to, args->listen_uri, &args->start)) { + if (migrate_start(&from, &to, "defer", &args->start)) { return -1; } =20 @@ -128,11 +128,17 @@ static void test_mode_transfer_common(MigrateCommon *= args, bool incoming_defer) int cpr_sockfd =3D qtest_socket_server(cpr_path); g_assert(cpr_sockfd >=3D 0); =20 - opts_target =3D g_strdup_printf("-incoming cpr,addr.transport=3Dsocket= ," - "addr.type=3Dfd,addr.str=3D%d %s", - cpr_sockfd, opts); + if (incoming_defer) { + opts_target =3D g_strdup_printf("-incoming cpr,addr.transport=3Dso= cket," + "addr.type=3Dfd,addr.str=3D%d %s", + cpr_sockfd, opts); + } else { + opts_target =3D g_strdup_printf("-incoming %s " + "-incoming cpr,addr.transport=3Dsock= et," + "addr.type=3Dfd,addr.str=3D%d %s", + uri, cpr_sockfd, opts); + } =20 - args->listen_uri =3D incoming_defer ? "defer" : uri; args->connect_channels =3D connect_channels; =20 args->start.opts_source =3D opts; @@ -224,7 +230,7 @@ static void test_cpr_exec(MigrateCommon *args) g_autofree char *filename =3D g_strdup_printf("%s/%s", tmpfs, FILE_TEST_FILENAME); =20 - if (migrate_start(&from, NULL, args->listen_uri, &args->start)) { + if (migrate_start(&from, NULL, "defer", &args->start)) { return; } =20 @@ -274,10 +280,7 @@ static void test_mode_exec(char *name, MigrateCommon *= args) { g_autofree char *uri =3D g_strdup_printf("file:%s/%s", tmpfs, FILE_TEST_FILENAME); - g_autofree char *listen_uri =3D g_strdup_printf("defer"); - args->connect_uri =3D uri; - args->listen_uri =3D listen_uri; args->start_hook =3D test_mode_exec_start; =20 args->start.only_source =3D true; --=20 2.51.0 From nobody Tue May 26 12:01:12 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=suse.de ARC-Seal: i=1; a=rsa-sha256; t=1777997467; cv=none; d=zohomail.com; s=zohoarc; b=ENuYfYU5iPNzW5TexPQHRH5+3k1AgKuMnExIkzzURgJtsQ2/4ap52HDHTa2rjTts2Sn6iB5M3SVE/bYGTefAwR9ggKL/8u1ZlLSEsoyo06XIoAwBFV9KwNt3Lg8G6tPYNaj9fK2bnIq7LcZDAMLH924lJD2QNnlTixXYReh9oOM= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1777997467; 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=TWSuqm2EvFSSbzcuxVuMGiErvtrgzCXMGumdOpuWzZg=; b=YBO8J6+qXWjXpHlzqqCTRFCTd40D3kSrlelv9eLvCVkJLYRDCuHHnQF0dQ6rbq77AwRJE1IRosK0wYYamnx+wBaXZ5xgA2SUPnUCIMz5dkZf0b5zMIkVQGN+h1cL4ADzQe7Hsq232MVZy5GHAp+KXMdda5P3lEODa0hMXZqPxTY= 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 lists1p.gnu.org (lists1p.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1777997467473732.4474449500326; Tue, 5 May 2026 09:11:07 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists1p.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1wKIM7-0008SU-KF; Tue, 05 May 2026 12:10:45 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists1p.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1wKILO-00083n-Q7 for qemu-devel@nongnu.org; Tue, 05 May 2026 12:09:59 -0400 Received: from smtp-out2.suse.de ([195.135.223.131]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1wKILM-0008IW-VQ for qemu-devel@nongnu.org; Tue, 05 May 2026 12:09:58 -0400 Received: from imap1.dmz-prg2.suse.org (imap1.dmz-prg2.suse.org [IPv6:2a07:de40:b281:104:10:150:64:97]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by smtp-out2.suse.de (Postfix) with ESMTPS id 7C4CD5CB18; Tue, 5 May 2026 16:09:42 +0000 (UTC) Received: from imap1.dmz-prg2.suse.org (localhost [127.0.0.1]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by imap1.dmz-prg2.suse.org (Postfix) with ESMTPS id 592FD593A3; Tue, 5 May 2026 16:09:41 +0000 (UTC) Received: from dovecot-director2.suse.de ([2a07:de40:b281:106:10:150:64:167]) by imap1.dmz-prg2.suse.org with ESMTPSA id MMqbCkUW+mmNcgAAD6G6ig (envelope-from ); Tue, 05 May 2026 16:09:41 +0000 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=suse.de; s=susede2_rsa; t=1777997382; h=from:from:reply-to: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=TWSuqm2EvFSSbzcuxVuMGiErvtrgzCXMGumdOpuWzZg=; b=tqH84iIwCyFUDbKk3SvOVUBF/xTczfHsb1C69j1Vcxvy2raivWVQOK6br0PNLenYynSkuL 2XhXObZsIXn6JRkmUndxfUVZaG2vCabIQArrBqFkIGGESqNXxdhhZMm+ZcROZ7W7fIgyzV GCw3hlS0VPErbjCgE2F1rv+6/cGvC4A= DKIM-Signature: v=1; a=ed25519-sha256; c=relaxed/relaxed; d=suse.de; s=susede2_ed25519; t=1777997382; h=from:from:reply-to: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=TWSuqm2EvFSSbzcuxVuMGiErvtrgzCXMGumdOpuWzZg=; b=OIIoKAUMDVHA3io73FwEFQrMPvwkTPEJlev0fKeUQyDmA2GRTJPMp5/UVxPLP8wE3Vl79U o4J7YmNZUPVViyDg== Authentication-Results: smtp-out2.suse.de; dkim=pass header.d=suse.de header.s=susede2_rsa header.b=tqH84iIw; dkim=pass header.d=suse.de header.s=susede2_ed25519 header.b=OIIoKAUM DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=suse.de; s=susede2_rsa; t=1777997382; h=from:from:reply-to: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=TWSuqm2EvFSSbzcuxVuMGiErvtrgzCXMGumdOpuWzZg=; b=tqH84iIwCyFUDbKk3SvOVUBF/xTczfHsb1C69j1Vcxvy2raivWVQOK6br0PNLenYynSkuL 2XhXObZsIXn6JRkmUndxfUVZaG2vCabIQArrBqFkIGGESqNXxdhhZMm+ZcROZ7W7fIgyzV GCw3hlS0VPErbjCgE2F1rv+6/cGvC4A= DKIM-Signature: v=1; a=ed25519-sha256; c=relaxed/relaxed; d=suse.de; s=susede2_ed25519; t=1777997382; h=from:from:reply-to: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=TWSuqm2EvFSSbzcuxVuMGiErvtrgzCXMGumdOpuWzZg=; b=OIIoKAUMDVHA3io73FwEFQrMPvwkTPEJlev0fKeUQyDmA2GRTJPMp5/UVxPLP8wE3Vl79U o4J7YmNZUPVViyDg== From: Fabiano Rosas To: qemu-devel@nongnu.org Cc: Peter Xu , Laurent Vivier , Paolo Bonzini Subject: [PATCH v1 12/15] tests/qtest/migration: Use defer for auto-converge Date: Tue, 5 May 2026 13:09:11 -0300 Message-ID: <20260505160915.25558-13-farosas@suse.de> X-Mailer: git-send-email 2.51.0 In-Reply-To: <20260505160915.25558-1-farosas@suse.de> References: <20260505160915.25558-1-farosas@suse.de> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable X-Spam-Score: -3.01 X-Rspamd-Action: no action X-Spamd-Result: default: False [-3.01 / 50.00]; BAYES_HAM(-3.00)[100.00%]; MID_CONTAINS_FROM(1.00)[]; NEURAL_HAM_LONG(-1.00)[-1.000]; R_MISSING_CHARSET(0.50)[]; R_DKIM_ALLOW(-0.20)[suse.de:s=susede2_rsa,suse.de:s=susede2_ed25519]; NEURAL_HAM_SHORT(-0.20)[-1.000]; MIME_GOOD(-0.10)[text/plain]; MX_GOOD(-0.01)[]; TO_MATCH_ENVRCPT_ALL(0.00)[]; TO_DN_SOME(0.00)[]; DKIM_SIGNED(0.00)[suse.de:s=susede2_rsa,suse.de:s=susede2_ed25519]; MIME_TRACE(0.00)[0:+]; FUZZY_RATELIMITED(0.00)[rspamd.com]; ARC_NA(0.00)[]; RCVD_TLS_ALL(0.00)[]; DKIM_TRACE(0.00)[suse.de:+]; FROM_EQ_ENVFROM(0.00)[]; FROM_HAS_DN(0.00)[]; SPAMHAUS_XBL(0.00)[2a07:de40:b281:104:10:150:64:97:from]; RCVD_COUNT_TWO(0.00)[2]; RCVD_VIA_SMTP_AUTH(0.00)[]; DNSWL_BLOCKED(0.00)[2a07:de40:b281:106:10:150:64:167:received]; RCPT_COUNT_THREE(0.00)[4]; DBL_BLOCKED_OPENRESOLVER(0.00)[imap1.dmz-prg2.suse.org:rdns, imap1.dmz-prg2.suse.org:helo, suse.de:email, suse.de:dkim, suse.de:mid] X-Rspamd-Server: rspamd1.dmz-prg2.suse.org X-Rspamd-Queue-Id: 7C4CD5CB18 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=lists1p.gnu.org; Received-SPF: pass client-ip=195.135.223.131; envelope-from=farosas@suse.de; helo=smtp-out2.suse.de X-Spam_score_int: -43 X-Spam_score: -4.4 X-Spam_bar: ---- X-Spam_report: (-4.4 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_MED=-2.3, SPF_HELO_NONE=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 @suse.de) X-ZM-MESSAGEID: 1777997468851158500 Content-Type: text/plain; charset="utf-8" Signed-off-by: Fabiano Rosas Reviewed-by: Peter Xu --- tests/qtest/migration/precopy-tests.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/tests/qtest/migration/precopy-tests.c b/tests/qtest/migration/= precopy-tests.c index 45a8f6d76c..67c5b40789 100644 --- a/tests/qtest/migration/precopy-tests.c +++ b/tests/qtest/migration/precopy-tests.c @@ -291,7 +291,7 @@ static void test_auto_converge(char *name, MigrateCommo= n *args) uint64_t prev_dirty_sync_cnt, dirty_sync_cnt; int max_try_count, hit =3D 0; =20 - if (migrate_start(&from, &to, uri, &args->start)) { + if (migrate_start(&from, &to, "defer", &args->start)) { return; } =20 @@ -312,6 +312,7 @@ static void test_auto_converge(char *name, MigrateCommo= n *args) /* Wait for the first serial output from the source */ wait_for_serial("src_serial"); =20 + migrate_incoming_qmp(to, uri, NULL, "{}"); migrate_qmp(from, to, uri, NULL, "{}"); =20 /* Wait for throttling begins */ --=20 2.51.0 From nobody Tue May 26 12:01:12 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=suse.de ARC-Seal: i=1; a=rsa-sha256; t=1777997485; cv=none; d=zohomail.com; s=zohoarc; b=F76Zxiytt5nbUK+/SL4Y7foPOJLVWPpSTqoknaZXTzPpqc2oPO+3kJeQBYf+o0KxpNzLJd0r+Vem5PHxjmj4d7V4iZ5ajyHJL5R58DKUHDMxXO9nVlVZ+a45OEYp1ks762Ana47wu5UrJ47EUV2J2188Cgzx4IAIcGer+73unBs= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1777997485; 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=+kvN6wP/CWcX2lAI3undlVFLjqrxdrSggKa4Da4Zcrs=; b=E8d+5kJDLxJGrn49s/qOoedpV5ao20NJtfJla9XZvQHPkKSrVPFnmmybOdVi6m71kbk18clC2CfLnr2Vz7AzWLc2occdHpjBIWADLPyOQ5Xn5NltHd2WA1VdMc4yIECyTSKjIMgQ7VE5+VHHWPlGMpNMsLlZTj7wGKKh89MM82A= 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 lists1p.gnu.org (lists1p.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1777997485015628.5613444510425; Tue, 5 May 2026 09:11:25 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists1p.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1wKIMY-0000Av-M2; Tue, 05 May 2026 12:11:10 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists1p.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1wKIMJ-00009h-LH for qemu-devel@nongnu.org; Tue, 05 May 2026 12:10:55 -0400 Received: from smtp-out1.suse.de ([2a07:de40:b251:101:10:150:64:1]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1wKIMH-0000wU-Rc for qemu-devel@nongnu.org; Tue, 05 May 2026 12:10:55 -0400 Received: from imap1.dmz-prg2.suse.org (unknown [10.150.64.97]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by smtp-out1.suse.de (Postfix) with ESMTPS id 0B78B6B76D; Tue, 5 May 2026 16:09:44 +0000 (UTC) Received: from imap1.dmz-prg2.suse.org (localhost [127.0.0.1]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by imap1.dmz-prg2.suse.org (Postfix) with ESMTPS id DB617593A3; Tue, 5 May 2026 16:09:42 +0000 (UTC) Received: from dovecot-director2.suse.de ([2a07:de40:b281:106:10:150:64:167]) by imap1.dmz-prg2.suse.org with ESMTPSA id 2FRnKkYW+mmNcgAAD6G6ig (envelope-from ); Tue, 05 May 2026 16:09:42 +0000 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=suse.de; s=susede2_rsa; t=1777997384; h=from:from:reply-to: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=+kvN6wP/CWcX2lAI3undlVFLjqrxdrSggKa4Da4Zcrs=; b=Tqjq+zYcMcRWgcTrZOxp0IX5ntjOs09J/Io/dCqh3YxLtgsMCt1yjItvza21zqibPkANdY mvdedMVQemANco33dHG07bQjrv/JYLso3N1Dk35D9x/Hyw/UeAIjxfZtWOZjbSHTFmdNDl 9HTi+ywmXRtpJGF/4nhBMqyz4g7TQYg= DKIM-Signature: v=1; a=ed25519-sha256; c=relaxed/relaxed; d=suse.de; s=susede2_ed25519; t=1777997384; h=from:from:reply-to: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=+kvN6wP/CWcX2lAI3undlVFLjqrxdrSggKa4Da4Zcrs=; b=Cu+uzyE579QGGvpJxAFgIhZsRAHDieahoEBCMeTb/F5B1aNN4HnUG3e64zDgoqoxwfraPq iSnqcY/YE/m1WdDg== Authentication-Results: smtp-out1.suse.de; none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=suse.de; s=susede2_rsa; t=1777997384; h=from:from:reply-to: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=+kvN6wP/CWcX2lAI3undlVFLjqrxdrSggKa4Da4Zcrs=; b=Tqjq+zYcMcRWgcTrZOxp0IX5ntjOs09J/Io/dCqh3YxLtgsMCt1yjItvza21zqibPkANdY mvdedMVQemANco33dHG07bQjrv/JYLso3N1Dk35D9x/Hyw/UeAIjxfZtWOZjbSHTFmdNDl 9HTi+ywmXRtpJGF/4nhBMqyz4g7TQYg= DKIM-Signature: v=1; a=ed25519-sha256; c=relaxed/relaxed; d=suse.de; s=susede2_ed25519; t=1777997384; h=from:from:reply-to: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=+kvN6wP/CWcX2lAI3undlVFLjqrxdrSggKa4Da4Zcrs=; b=Cu+uzyE579QGGvpJxAFgIhZsRAHDieahoEBCMeTb/F5B1aNN4HnUG3e64zDgoqoxwfraPq iSnqcY/YE/m1WdDg== From: Fabiano Rosas To: qemu-devel@nongnu.org Cc: Peter Xu , Laurent Vivier , Paolo Bonzini Subject: [PATCH v1 13/15] tests/qtest/migration: Use defer in dirty_limit test Date: Tue, 5 May 2026 13:09:12 -0300 Message-ID: <20260505160915.25558-14-farosas@suse.de> X-Mailer: git-send-email 2.51.0 In-Reply-To: <20260505160915.25558-1-farosas@suse.de> References: <20260505160915.25558-1-farosas@suse.de> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable X-Spam-Score: -2.80 X-Spamd-Result: default: False [-2.80 / 50.00]; BAYES_HAM(-3.00)[100.00%]; NEURAL_HAM_LONG(-1.00)[-1.000]; MID_CONTAINS_FROM(1.00)[]; R_MISSING_CHARSET(0.50)[]; NEURAL_HAM_SHORT(-0.20)[-1.000]; MIME_GOOD(-0.10)[text/plain]; TO_MATCH_ENVRCPT_ALL(0.00)[]; FROM_HAS_DN(0.00)[]; ARC_NA(0.00)[]; MIME_TRACE(0.00)[0:+]; TO_DN_SOME(0.00)[]; DBL_BLOCKED_OPENRESOLVER(0.00)[suse.de:email,suse.de:mid,imap1.dmz-prg2.suse.org:helo]; RCVD_VIA_SMTP_AUTH(0.00)[]; FROM_EQ_ENVFROM(0.00)[]; RCVD_COUNT_TWO(0.00)[2]; FUZZY_RATELIMITED(0.00)[rspamd.com]; DKIM_SIGNED(0.00)[suse.de:s=susede2_rsa,suse.de:s=susede2_ed25519]; RCPT_COUNT_THREE(0.00)[4]; RCVD_TLS_ALL(0.00)[] 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=lists1p.gnu.org; Received-SPF: pass client-ip=2a07:de40:b251:101:10:150:64:1; envelope-from=farosas@suse.de; helo=smtp-out1.suse.de 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, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, SPF_HELO_NONE=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 @suse.de) X-ZM-MESSAGEID: 1777997486515158500 Content-Type: text/plain; charset="utf-8" Signed-off-by: Fabiano Rosas Reviewed-by: Peter Xu --- tests/qtest/migration/precopy-tests.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/tests/qtest/migration/precopy-tests.c b/tests/qtest/migration/= precopy-tests.c index 67c5b40789..b13e84e26d 100644 --- a/tests/qtest/migration/precopy-tests.c +++ b/tests/qtest/migration/precopy-tests.c @@ -1077,11 +1077,12 @@ static void test_dirty_limit(char *name, MigrateCom= mon *args) args->start.use_dirty_ring =3D true; =20 /* Restart dst vm, src vm already show up so we needn't wait anymore */ - if (migrate_start(&from, &to, args->listen_uri, &args->start)) { + if (migrate_start(&from, &to, "defer", &args->start)) { return; } =20 /* Start migrate */ + migrate_incoming_qmp(to, args->listen_uri, NULL, "{}"); migrate_qmp(from, to, args->connect_uri, NULL, "{}"); =20 /* Wait for dirty limit throttle begin */ --=20 2.51.0 From nobody Tue May 26 12:01:12 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=suse.de ARC-Seal: i=1; a=rsa-sha256; t=1777997537; cv=none; d=zohomail.com; s=zohoarc; b=HxCobsZDX7CNjDnGtWLrU7/nYQ6/iJdgvQj3t0xzszZRz/XolVwSZRQ5zwNFFA5exZM1WF5E5+spa7K4k+UzOqqlHExy3tsw+0cLhswOBmN68a0y+FsiA+co4Qp9KPjTfWOQbG+VEKOClmelfv402kL/Mw4Uq65bpwwKVNdAMDA= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1777997537; 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=oyZZ68G2Wgyo9Jg2YrN5+k9bAyveWB5OkHRK5G9arB8=; b=kUEtXmcwrH3FxkQGiYRLit64O1ZqbwB5XMxMuWPj0vjD9pXmwLU6MrR7oFUi8mFpSyOYEdO3GGVLHglt9nLFPz9z0SUix1LyHimqnYwHDRulYf+he6BN/WaapJi0/JQBVpGBRMxk1H3jqRIc8SFZq6uYfX0nc8QEBQe2fRIF4d0= 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 lists1p.gnu.org (lists1p.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1777997537578643.4967089058093; Tue, 5 May 2026 09:12:17 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists1p.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1wKIMr-0000jE-PO; Tue, 05 May 2026 12:11:29 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists1p.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1wKIMU-0000Ip-Pr for qemu-devel@nongnu.org; Tue, 05 May 2026 12:11:10 -0400 Received: from smtp-out1.suse.de ([2a07:de40:b251:101:10:150:64:1]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1wKIMQ-00011s-Bv for qemu-devel@nongnu.org; Tue, 05 May 2026 12:11:05 -0400 Received: from imap1.dmz-prg2.suse.org (unknown [10.150.64.97]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by smtp-out1.suse.de (Postfix) with ESMTPS id 2FCCD6B769; Tue, 5 May 2026 16:09:46 +0000 (UTC) Received: from imap1.dmz-prg2.suse.org (localhost [127.0.0.1]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by imap1.dmz-prg2.suse.org (Postfix) with ESMTPS id 76056593A3; Tue, 5 May 2026 16:09:44 +0000 (UTC) Received: from dovecot-director2.suse.de ([2a07:de40:b281:106:10:150:64:167]) by imap1.dmz-prg2.suse.org with ESMTPSA id CAShEUgW+mmNcgAAD6G6ig (envelope-from ); Tue, 05 May 2026 16:09:44 +0000 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=suse.de; s=susede2_rsa; t=1777997386; h=from:from:reply-to: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=oyZZ68G2Wgyo9Jg2YrN5+k9bAyveWB5OkHRK5G9arB8=; b=kdJ1x7p/Y4A7jlgNMZ4Liyhu6eH/CHIHw17OG6XXAKzioycerxm9+I5hWTysdXyFhQDw8F 0vNN4LReHYxpofaL5AmxaQjnTWGpyQNYNM/cZVPVuP8wkDWzAjH1qqNiN1pcfHgedu1g2d uiUSZZ+SS3tIFjrWsWL1siqLmYaLJxk= DKIM-Signature: v=1; a=ed25519-sha256; c=relaxed/relaxed; d=suse.de; s=susede2_ed25519; t=1777997386; h=from:from:reply-to: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=oyZZ68G2Wgyo9Jg2YrN5+k9bAyveWB5OkHRK5G9arB8=; b=zcT2hlNoQkVNCeZpIBCJCxaktR5DGj15Cj5LSwz+HjYYJa72BKAHOAYwDA1rjyQ7wXLXyq vcue/NWyq1GCQzDg== Authentication-Results: smtp-out1.suse.de; none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=suse.de; s=susede2_rsa; t=1777997386; h=from:from:reply-to: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=oyZZ68G2Wgyo9Jg2YrN5+k9bAyveWB5OkHRK5G9arB8=; b=kdJ1x7p/Y4A7jlgNMZ4Liyhu6eH/CHIHw17OG6XXAKzioycerxm9+I5hWTysdXyFhQDw8F 0vNN4LReHYxpofaL5AmxaQjnTWGpyQNYNM/cZVPVuP8wkDWzAjH1qqNiN1pcfHgedu1g2d uiUSZZ+SS3tIFjrWsWL1siqLmYaLJxk= DKIM-Signature: v=1; a=ed25519-sha256; c=relaxed/relaxed; d=suse.de; s=susede2_ed25519; t=1777997386; h=from:from:reply-to: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=oyZZ68G2Wgyo9Jg2YrN5+k9bAyveWB5OkHRK5G9arB8=; b=zcT2hlNoQkVNCeZpIBCJCxaktR5DGj15Cj5LSwz+HjYYJa72BKAHOAYwDA1rjyQ7wXLXyq vcue/NWyq1GCQzDg== From: Fabiano Rosas To: qemu-devel@nongnu.org Cc: Peter Xu , Lukas Straub , Laurent Vivier , Paolo Bonzini , Mark Kanda , Ben Chaney Subject: [PATCH v1 14/15] tests/qtest/migration: Stop passing URI into migrate_start Date: Tue, 5 May 2026 13:09:13 -0300 Message-ID: <20260505160915.25558-15-farosas@suse.de> X-Mailer: git-send-email 2.51.0 In-Reply-To: <20260505160915.25558-1-farosas@suse.de> References: <20260505160915.25558-1-farosas@suse.de> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable X-Spamd-Result: default: False [-2.80 / 50.00]; BAYES_HAM(-3.00)[100.00%]; NEURAL_HAM_LONG(-1.00)[-1.000]; MID_CONTAINS_FROM(1.00)[]; R_MISSING_CHARSET(0.50)[]; NEURAL_HAM_SHORT(-0.20)[-1.000]; MIME_GOOD(-0.10)[text/plain]; TO_MATCH_ENVRCPT_ALL(0.00)[]; RCVD_VIA_SMTP_AUTH(0.00)[]; FUZZY_RATELIMITED(0.00)[rspamd.com]; ARC_NA(0.00)[]; MIME_TRACE(0.00)[0:+]; FREEMAIL_CC(0.00)[redhat.com,web.de,oracle.com,akamai.com]; DBL_BLOCKED_OPENRESOLVER(0.00)[suse.de:mid,suse.de:email,imap1.dmz-prg2.suse.org:helo]; FROM_HAS_DN(0.00)[]; RCPT_COUNT_SEVEN(0.00)[7]; RCVD_COUNT_TWO(0.00)[2]; RCVD_TLS_ALL(0.00)[]; FROM_EQ_ENVFROM(0.00)[]; TO_DN_SOME(0.00)[]; DKIM_SIGNED(0.00)[suse.de:s=susede2_rsa,suse.de:s=susede2_ed25519]; FREEMAIL_ENVRCPT(0.00)[web.de] X-Spam-Score: -2.80 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=lists1p.gnu.org; Received-SPF: pass client-ip=2a07:de40:b251:101:10:150:64:1; envelope-from=farosas@suse.de; helo=smtp-out1.suse.de 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, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, SPF_HELO_NONE=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 @suse.de) X-ZM-MESSAGEID: 1777997538809158500 Content-Type: text/plain; charset="utf-8" Don't allow changing the default -incoming URI via migrate_start. The default is now -incoming defer. If a test really needs to alter this (such as with CPR), the target_opts variable is still available to change the command line. (aside from the larger goal of using defer, this change is a step towards allowing migrate_start() to be invoked only once for all tests) Signed-off-by: Fabiano Rosas Reviewed-by: Lukas Straub Reviewed-by: Peter Xu Tested-by: Lukas Straub --- tests/qtest/migration/colo-tests.c | 2 +- tests/qtest/migration/cpr-tests.c | 6 +++--- tests/qtest/migration/file-tests.c | 3 +-- tests/qtest/migration/framework.c | 17 ++++++++--------- tests/qtest/migration/framework.h | 5 ++--- tests/qtest/migration/misc-tests.c | 10 +++++----- tests/qtest/migration/precopy-tests.c | 12 ++++++------ 7 files changed, 26 insertions(+), 29 deletions(-) diff --git a/tests/qtest/migration/colo-tests.c b/tests/qtest/migration/col= o-tests.c index 4add4a014b..a3d27e7bf6 100644 --- a/tests/qtest/migration/colo-tests.c +++ b/tests/qtest/migration/colo-tests.c @@ -45,7 +45,7 @@ static int test_colo_common(MigrateCommon *args, args->start.caps[MIGRATION_CAPABILITY_RETURN_PATH] =3D true; args->start.caps[MIGRATION_CAPABILITY_X_COLO] =3D true; =20 - if (migrate_start(&from, &to, "defer", &args->start)) { + if (migrate_start(&from, &to, &args->start)) { return -1; } =20 diff --git a/tests/qtest/migration/cpr-tests.c b/tests/qtest/migration/cpr-= tests.c index 9091a84213..fc09dad9c0 100644 --- a/tests/qtest/migration/cpr-tests.c +++ b/tests/qtest/migration/cpr-tests.c @@ -60,7 +60,7 @@ static int test_transfer(MigrateCommon *args, const char = *cpr_channel, obj =3D migrate_str_to_channel(cpr_channel); qlist_append(channels_list, obj); =20 - if (migrate_start(&from, &to, "defer", &args->start)) { + if (migrate_start(&from, &to, &args->start)) { return -1; } =20 @@ -179,7 +179,7 @@ static void set_cpr_exec_args(QTestState *who, MigrateC= ommon *args) */ g_assert(args->start.hide_stderr =3D=3D false); =20 - ret =3D migrate_args(&from_args, &to_args, args->listen_uri, &args->st= art); + ret =3D migrate_args(&from_args, &to_args, &args->start); g_assert(!ret); qtest_from_args =3D qtest_qemu_args(from_args); =20 @@ -230,7 +230,7 @@ static void test_cpr_exec(MigrateCommon *args) g_autofree char *filename =3D g_strdup_printf("%s/%s", tmpfs, FILE_TEST_FILENAME); =20 - if (migrate_start(&from, NULL, "defer", &args->start)) { + if (migrate_start(&from, NULL, &args->start)) { return; } =20 diff --git a/tests/qtest/migration/file-tests.c b/tests/qtest/migration/fil= e-tests.c index 4b6a2eeb7b..36109d30ba 100644 --- a/tests/qtest/migration/file-tests.c +++ b/tests/qtest/migration/file-tests.c @@ -47,8 +47,7 @@ static void test_file_connect_outgoing_fd_leak(char *name= , MigrateCommon *args) return; } =20 - args->listen_uri =3D "defer"; - if (migrate_start(&from, &to, args->listen_uri, &args->start)) { + if (migrate_start(&from, &to, &args->start)) { return; } =20 diff --git a/tests/qtest/migration/framework.c b/tests/qtest/migration/fram= ework.c index 9df33f8809..2acbe709b7 100644 --- a/tests/qtest/migration/framework.c +++ b/tests/qtest/migration/framework.c @@ -308,7 +308,7 @@ static char *migrate_mem_type_get_opts(MemType type, co= nst char *memory_size) return opts; } =20 -int migrate_args(char **from, char **to, const char *uri, MigrateStart *ar= gs) +int migrate_args(char **from, char **to, MigrateStart *args) { /* options for source and target */ g_autofree gchar *arch_opts =3D NULL; @@ -423,11 +423,11 @@ int migrate_args(char **from, char **to, const char *= uri, MigrateStart *args) "-name target,debug-threads=3Don " "%s " "-serial file:%s/dest_serial " - "-incoming %s " + "-incoming defer " "%s %s %s %s", kvm_opts ? kvm_opts : "", machine, machine_opts, - memory_backend, tmpfs, uri, + memory_backend, tmpfs, events, arch_opts ? arch_opts : "", args->opts_target ? args->opts_target : "= ", @@ -474,8 +474,7 @@ static void migrate_mem_type_cleanup(MemType type) } } =20 -int migrate_start(QTestState **from, QTestState **to, const char *uri, - MigrateStart *args) +int migrate_start(QTestState **from, QTestState **to, MigrateStart *args) { g_autofree gchar *cmd_source =3D NULL; g_autofree gchar *cmd_target =3D NULL; @@ -490,7 +489,7 @@ int migrate_start(QTestState **from, QTestState **to, c= onst char *uri, bootfile_create(qtest_get_arch(), tmpfs, args->suspend_me); src_state.suspend_me =3D args->suspend_me; =20 - if (migrate_args(&cmd_source, &cmd_target, uri, args)) { + if (migrate_args(&cmd_source, &cmd_target, args)) { return -1; } =20 @@ -563,7 +562,7 @@ static int migrate_postcopy_prepare(QTestState **from_p= tr, args->start.caps[MIGRATION_CAPABILITY_POSTCOPY_BLOCKTIME] =3D true; args->start.caps[MIGRATION_CAPABILITY_POSTCOPY_RAM] =3D true; =20 - if (migrate_start(&from, &to, "defer", &args->start)) { + if (migrate_start(&from, &to, &args->start)) { return -1; } =20 @@ -842,7 +841,7 @@ int test_precopy_common(MigrateCommon *args) args->listen_uri =3D "tcp:127.0.0.1:0"; } =20 - if (migrate_start(&from, &to, "defer", &args->start)) { + if (migrate_start(&from, &to, &args->start)) { return -1; } =20 @@ -991,7 +990,7 @@ void test_file_common(MigrateCommon *args, bool stop_sr= c) bool check_offset =3D false; g_autofree char *uri =3D NULL; =20 - if (migrate_start(&from, &to, "defer", &args->start)) { + if (migrate_start(&from, &to, &args->start)) { return; } =20 diff --git a/tests/qtest/migration/framework.h b/tests/qtest/migration/fram= ework.h index 7635e9fac1..65d3912fda 100644 --- a/tests/qtest/migration/framework.h +++ b/tests/qtest/migration/framework.h @@ -230,9 +230,8 @@ void wait_for_serial(const char *side); void migrate_prepare_for_dirty_mem(QTestState *from); void migrate_wait_for_dirty_mem(QTestState *from, QTestState *to); =20 -int migrate_args(char **from, char **to, const char *uri, MigrateStart *ar= gs); -int migrate_start(QTestState **from, QTestState **to, const char *uri, - MigrateStart *args); +int migrate_args(char **from, char **to, MigrateStart *args); +int migrate_start(QTestState **from, QTestState **to, MigrateStart *args); void migrate_end(QTestState *from, QTestState *to, bool test_dest); =20 void test_postcopy_common(MigrateCommon *args); diff --git a/tests/qtest/migration/misc-tests.c b/tests/qtest/migration/mis= c-tests.c index 8216b5d79d..e5d5fc4959 100644 --- a/tests/qtest/migration/misc-tests.c +++ b/tests/qtest/migration/misc-tests.c @@ -28,7 +28,7 @@ static void test_baddest(char *name, MigrateCommon *args) =20 args->start.hide_stderr =3D true; =20 - if (migrate_start(&from, &to, "defer", &args->start)) { + if (migrate_start(&from, &to, &args->start)) { return; } =20 @@ -54,7 +54,7 @@ static void test_analyze_script(char *name, MigrateCommon= *args) return; } =20 - if (migrate_start(&from, &to, "defer", &args->start)) { + if (migrate_start(&from, &to, &args->start)) { return; } =20 @@ -115,7 +115,7 @@ static void do_test_validate_uuid(MigrateStart *args, b= ool should_fail) g_autofree char *uri =3D g_strdup_printf("unix:%s/migsocket", tmpfs); QTestState *from, *to; =20 - if (migrate_start(&from, &to, "defer", args)) { + if (migrate_start(&from, &to, args)) { return; } =20 @@ -180,7 +180,7 @@ static void do_test_validate_uri_channel(MigrateCommon = *args) QTestState *from, *to; QObject *channels; =20 - if (migrate_start(&from, &to, "defer", &args->start)) { + if (migrate_start(&from, &to, &args->start)) { return; } =20 @@ -234,7 +234,7 @@ static void test_validate_caps_pair(char *test_path, Mi= grateCommon *args) args->start.hide_stderr =3D true; args->start.only_source =3D true; =20 - if (migrate_start(&from, &to, "defer", &args->start)) { + if (migrate_start(&from, &to, &args->start)) { return; } =20 diff --git a/tests/qtest/migration/precopy-tests.c b/tests/qtest/migration/= precopy-tests.c index b13e84e26d..a9381fa3bf 100644 --- a/tests/qtest/migration/precopy-tests.c +++ b/tests/qtest/migration/precopy-tests.c @@ -291,7 +291,7 @@ static void test_auto_converge(char *name, MigrateCommo= n *args) uint64_t prev_dirty_sync_cnt, dirty_sync_cnt; int max_try_count, hit =3D 0; =20 - if (migrate_start(&from, &to, "defer", &args->start)) { + if (migrate_start(&from, &to, &args->start)) { return; } =20 @@ -470,7 +470,7 @@ static void test_multifd_tcp_cancel(MigrateCommon *args= , bool postcopy_ram) =20 args->start.hide_stderr =3D true; =20 - if (migrate_start(&from, &to, "defer", &args->start)) { + if (migrate_start(&from, &to, &args->start)) { return; } =20 @@ -516,7 +516,7 @@ static void test_multifd_tcp_cancel(MigrateCommon *args= , bool postcopy_ram) =20 args->start.only_target =3D true; =20 - if (migrate_start(&from, &to2, "defer", &args->start)) { + if (migrate_start(&from, &to2, &args->start)) { return; } =20 @@ -690,7 +690,7 @@ static void test_cancel_src_after_status(char *test_pat= h, MigrateCommon *args) =20 args->start.hide_stderr =3D true; =20 - if (migrate_start(&from, &to, "defer", &args->start)) { + if (migrate_start(&from, &to, &args->start)) { return; } =20 @@ -1029,7 +1029,7 @@ static void test_dirty_limit(char *name, MigrateCommo= n *args) args->connect_uri =3D uri; =20 /* Start src, dst vm */ - if (migrate_start(&from, &to, "defer", &args->start)) { + if (migrate_start(&from, &to, &args->start)) { return; } =20 @@ -1077,7 +1077,7 @@ static void test_dirty_limit(char *name, MigrateCommo= n *args) args->start.use_dirty_ring =3D true; =20 /* Restart dst vm, src vm already show up so we needn't wait anymore */ - if (migrate_start(&from, &to, "defer", &args->start)) { + if (migrate_start(&from, &to, &args->start)) { return; } =20 --=20 2.51.0 From nobody Tue May 26 12:01:12 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=suse.de ARC-Seal: i=1; a=rsa-sha256; t=1777997520; cv=none; d=zohomail.com; s=zohoarc; b=ixYCrmzEXacCAmpHaDwKHiW75IIT72tuT2xNFYDpciocldRqw3/W3/BSW1cRw5JA4JPCcVR4BVCSe4bm5rUrvTQaoAKu6Rn1kNTqBUFPCQEkHQ+mRGQMsbx2or8eNhyVwy11q7//7PXBnZPKjfwtQ/mKgOlJVWuzOBOi9FRnkHQ= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1777997520; 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=YKg8mJ+rvLFsh+SlfVpKhwypU3tAlhSOY0TiXz/7ey0=; b=inm11bWu67uLtzpLziqTjfJnEo8yjgeOftekz/N3tc7wNIwpNr89eZIzoSe3a2YDXeww9kPIFQXUK7YCiL6gL6imiH2lHHTrlZY3rI6//vILbca2gl/MrnVIf4UKl2gOnQj/7ggiNwCVZysC22Zwu9jew9CcqHknZv0tDBsUT1Q= 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 lists1p.gnu.org (lists1p.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1777997520524964.9735590941033; Tue, 5 May 2026 09:12:00 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists1p.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1wKIMs-0000mA-MT; Tue, 05 May 2026 12:11:31 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists1p.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1wKIMb-0000M0-2A for qemu-devel@nongnu.org; Tue, 05 May 2026 12:11:13 -0400 Received: from smtp-out1.suse.de ([195.135.223.130]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1wKIMY-0001HV-LM for qemu-devel@nongnu.org; Tue, 05 May 2026 12:11:12 -0400 Received: from imap1.dmz-prg2.suse.org (unknown [10.150.64.97]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by smtp-out1.suse.de (Postfix) with ESMTPS id 55B4E6B76A; Tue, 5 May 2026 16:09:48 +0000 (UTC) Received: from imap1.dmz-prg2.suse.org (localhost [127.0.0.1]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by imap1.dmz-prg2.suse.org (Postfix) with ESMTPS id 9AA71593A3; Tue, 5 May 2026 16:09:46 +0000 (UTC) Received: from dovecot-director2.suse.de ([2a07:de40:b281:106:10:150:64:167]) by imap1.dmz-prg2.suse.org with ESMTPSA id yMSZGkoW+mmNcgAAD6G6ig (envelope-from ); Tue, 05 May 2026 16:09:46 +0000 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=suse.de; s=susede2_rsa; t=1777997388; h=from:from:reply-to: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=YKg8mJ+rvLFsh+SlfVpKhwypU3tAlhSOY0TiXz/7ey0=; b=MXHrq+attL5hcOtlIYz85n/hZSuG+5WLoGPTn8x48S7iOTAbJ/XA44nNBytI4SC6Xi2dme JChd4Uxjfmz/Z0DCEOfAEkaNpjJYjw6UtJwf10Wt1JyV8Q8AnCKtXv19KVFUC/Gz3WOjMA qoqrmLJWPjk4FwHAnYJMLLTYJ7+Q4e4= DKIM-Signature: v=1; a=ed25519-sha256; c=relaxed/relaxed; d=suse.de; s=susede2_ed25519; t=1777997388; h=from:from:reply-to: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=YKg8mJ+rvLFsh+SlfVpKhwypU3tAlhSOY0TiXz/7ey0=; b=21+4hvD00TJUvi+JrH8e5ArDzslszqpdT4nFRs3wX0aaPu86IHrh1U5nP6r5if9yXayHJn W45YsomK/BKqEUAQ== Authentication-Results: smtp-out1.suse.de; none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=suse.de; s=susede2_rsa; t=1777997388; h=from:from:reply-to: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=YKg8mJ+rvLFsh+SlfVpKhwypU3tAlhSOY0TiXz/7ey0=; b=MXHrq+attL5hcOtlIYz85n/hZSuG+5WLoGPTn8x48S7iOTAbJ/XA44nNBytI4SC6Xi2dme JChd4Uxjfmz/Z0DCEOfAEkaNpjJYjw6UtJwf10Wt1JyV8Q8AnCKtXv19KVFUC/Gz3WOjMA qoqrmLJWPjk4FwHAnYJMLLTYJ7+Q4e4= DKIM-Signature: v=1; a=ed25519-sha256; c=relaxed/relaxed; d=suse.de; s=susede2_ed25519; t=1777997388; h=from:from:reply-to: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=YKg8mJ+rvLFsh+SlfVpKhwypU3tAlhSOY0TiXz/7ey0=; b=21+4hvD00TJUvi+JrH8e5ArDzslszqpdT4nFRs3wX0aaPu86IHrh1U5nP6r5if9yXayHJn W45YsomK/BKqEUAQ== From: Fabiano Rosas To: qemu-devel@nongnu.org Cc: Peter Xu , Lukas Straub , Laurent Vivier , Paolo Bonzini , Mark Kanda , Ben Chaney Subject: [PATCH v1 15/15] tests/qtest/migration: Unify URIs Date: Tue, 5 May 2026 13:09:14 -0300 Message-ID: <20260505160915.25558-16-farosas@suse.de> X-Mailer: git-send-email 2.51.0 In-Reply-To: <20260505160915.25558-1-farosas@suse.de> References: <20260505160915.25558-1-farosas@suse.de> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable X-Spamd-Result: default: False [-2.80 / 50.00]; BAYES_HAM(-3.00)[100.00%]; MID_CONTAINS_FROM(1.00)[]; NEURAL_HAM_LONG(-1.00)[-1.000]; R_MISSING_CHARSET(0.50)[]; NEURAL_HAM_SHORT(-0.20)[-1.000]; MIME_GOOD(-0.10)[text/plain]; TO_MATCH_ENVRCPT_ALL(0.00)[]; DKIM_SIGNED(0.00)[suse.de:s=susede2_rsa,suse.de:s=susede2_ed25519]; ARC_NA(0.00)[]; FUZZY_RATELIMITED(0.00)[rspamd.com]; MIME_TRACE(0.00)[0:+]; FREEMAIL_CC(0.00)[redhat.com,web.de,oracle.com,akamai.com]; RCVD_TLS_ALL(0.00)[]; RCVD_VIA_SMTP_AUTH(0.00)[]; FROM_EQ_ENVFROM(0.00)[]; FROM_HAS_DN(0.00)[]; TO_DN_SOME(0.00)[]; RCVD_COUNT_TWO(0.00)[2]; RCPT_COUNT_SEVEN(0.00)[7]; DBL_BLOCKED_OPENRESOLVER(0.00)[imap1.dmz-prg2.suse.org:helo,suse.de:mid,suse.de:email]; FREEMAIL_ENVRCPT(0.00)[web.de] X-Spam-Score: -2.80 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=lists1p.gnu.org; Received-SPF: pass client-ip=195.135.223.130; envelope-from=farosas@suse.de; helo=smtp-out1.suse.de X-Spam_score_int: -43 X-Spam_score: -4.4 X-Spam_bar: ---- X-Spam_report: (-4.4 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_MED=-2.3, SPF_HELO_NONE=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 @suse.de) X-ZM-MESSAGEID: 1777997522890154100 Content-Type: text/plain; charset="utf-8" The migration tests have always used localhost migration and therefore the same URI for both sides of migration. Change the listen_uri and connect_uri into a single uri variable. For migrations using sockets, there's the possibility of detecting the socket address the destination side is using. For those, keep using different variables for migrate_qmp and migrate_incoming_qmp. Signed-off-by: Fabiano Rosas Reviewed-by: Lukas Straub Reviewed-by: Peter Xu Tested-by: Lukas Straub --- tests/qtest/migration/colo-tests.c | 8 ++++---- tests/qtest/migration/cpr-tests.c | 6 +++--- tests/qtest/migration/file-tests.c | 10 ++++----- tests/qtest/migration/framework.c | 29 ++++++++++----------------- tests/qtest/migration/framework.h | 14 ++++++------- tests/qtest/migration/misc-tests.c | 4 ++-- tests/qtest/migration/precopy-tests.c | 17 ++++++++-------- tests/qtest/migration/tls-tests.c | 2 +- 8 files changed, 40 insertions(+), 50 deletions(-) diff --git a/tests/qtest/migration/colo-tests.c b/tests/qtest/migration/col= o-tests.c index a3d27e7bf6..f7f9ba491b 100644 --- a/tests/qtest/migration/colo-tests.c +++ b/tests/qtest/migration/colo-tests.c @@ -55,12 +55,12 @@ static int test_colo_common(MigrateCommon *args, data_hook =3D args->start_hook(from, to); } =20 - migrate_incoming_qmp(to, args->listen_uri, NULL, "{}"); + migrate_incoming_qmp(to, args->uri, NULL, "{}"); =20 migrate_ensure_converge(from); wait_for_serial("src_serial"); =20 - migrate_qmp(from, to, args->connect_uri, NULL, "{}"); + migrate_qmp(from, to, NULL, NULL, "{}"); =20 wait_for_migration_status(from, "colo", NULL); wait_for_resume(to, get_dst()); @@ -105,7 +105,7 @@ static void test_colo_plain_common(MigrateCommon *args, bool failover_during_checkpoint, bool primary_failover) { - args->listen_uri =3D "tcp:127.0.0.1:0"; + args->uri =3D "tcp:127.0.0.1:0"; test_colo_common(args, failover_during_checkpoint, primary_failover); } =20 @@ -113,7 +113,7 @@ static void test_colo_multifd_common(MigrateCommon *arg= s, bool failover_during_checkpoint, bool primary_failover) { - args->listen_uri =3D "tcp:127.0.0.1:0"; + args->uri =3D "tcp:127.0.0.1:0"; args->start.caps[MIGRATION_CAPABILITY_MULTIFD] =3D true; test_colo_common(args, failover_during_checkpoint, primary_failover); } diff --git a/tests/qtest/migration/cpr-tests.c b/tests/qtest/migration/cpr-= tests.c index fc09dad9c0..0bec753b4a 100644 --- a/tests/qtest/migration/cpr-tests.c +++ b/tests/qtest/migration/cpr-tests.c @@ -35,7 +35,7 @@ static void test_mode_reboot(char *name, MigrateCommon *a= rgs) g_autofree char *uri =3D g_strdup_printf("file:%s/%s", tmpfs, FILE_TEST_FILENAME); =20 - args->connect_uri =3D uri; + args->uri =3D uri; args->start_hook =3D migrate_hook_start_mode_reboot; =20 args->start.mem_type =3D MEM_TYPE_SHMEM; @@ -226,7 +226,7 @@ static void test_cpr_exec(MigrateCommon *args) { QTestState *from, *to; void *data_hook =3D NULL; - g_autofree char *connect_uri =3D g_strdup(args->connect_uri); + g_autofree char *connect_uri =3D g_strdup(args->uri); g_autofree char *filename =3D g_strdup_printf("%s/%s", tmpfs, FILE_TEST_FILENAME); =20 @@ -280,7 +280,7 @@ static void test_mode_exec(char *name, MigrateCommon *a= rgs) { g_autofree char *uri =3D g_strdup_printf("file:%s/%s", tmpfs, FILE_TEST_FILENAME); - args->connect_uri =3D uri; + args->uri =3D uri; args->start_hook =3D test_mode_exec_start; =20 args->start.only_source =3D true; diff --git a/tests/qtest/migration/file-tests.c b/tests/qtest/migration/fil= e-tests.c index 36109d30ba..5118d9dec9 100644 --- a/tests/qtest/migration/file-tests.c +++ b/tests/qtest/migration/file-tests.c @@ -107,7 +107,7 @@ static void test_precopy_file_offset_fdset(char *name, = MigrateCommon *args) { g_autofree char *uri =3D g_strdup_printf("file:/dev/fdset/1,offset=3D%= d", FILE_TEST_OFFSET); - args->connect_uri =3D uri; + args->uri =3D uri; args->start_hook =3D migrate_hook_start_file_offset_fdset; =20 test_file_common(args, false); @@ -120,7 +120,7 @@ static void test_precopy_file_offset(char *name, Migrat= eCommon *args) FILE_TEST_FILENAME, FILE_TEST_OFFSET); =20 - args->connect_uri =3D uri; + args->uri =3D uri; test_file_common(args, false); } =20 @@ -130,7 +130,7 @@ static void test_precopy_file_offset_bad(char *name, Mi= grateCommon *args) g_autofree char *uri =3D g_strdup_printf("file:%s/%s,offset=3D0x20M", tmpfs, FILE_TEST_FILENAME); =20 - args->connect_uri =3D uri; + args->uri =3D uri; args->result =3D MIG_TEST_QMP_ERROR; =20 test_file_common(args, false); @@ -247,7 +247,7 @@ static void test_multifd_file_mapped_ram_fdset(char *na= me, MigrateCommon *args) g_autofree char *uri =3D g_strdup_printf("file:/dev/fdset/1,offset=3D%= d", FILE_TEST_OFFSET); =20 - args->connect_uri =3D uri; + args->uri =3D uri; args->start_hook =3D migrate_hook_start_multifd_mapped_ram_fdset; args->end_hook =3D migrate_hook_end_multifd_mapped_ram_fdset; =20 @@ -262,7 +262,7 @@ static void test_multifd_file_mapped_ram_fdset_dio(char= *name, { g_autofree char *uri =3D g_strdup_printf("file:/dev/fdset/1,offset=3D%= d", FILE_TEST_OFFSET); - args->connect_uri =3D uri; + args->uri =3D uri; args->start_hook =3D migrate_hook_start_multifd_mapped_ram_fdset_dio; args->end_hook =3D migrate_hook_end_multifd_mapped_ram_fdset; =20 diff --git a/tests/qtest/migration/framework.c b/tests/qtest/migration/fram= ework.c index 2acbe709b7..17bcd28c66 100644 --- a/tests/qtest/migration/framework.c +++ b/tests/qtest/migration/framework.c @@ -832,14 +832,7 @@ int test_precopy_common(MigrateCommon *args) QTestState *from, *to; void *data_hook =3D NULL; QObject *channels =3D NULL; - - assert(!args->connect_uri); - - if (args->listen_uri) { - args->connect_uri =3D args->listen_uri; - } else { - args->listen_uri =3D "tcp:127.0.0.1:0"; - } + const char *listen_uri =3D args->uri ?: "tcp:127.0.0.1:0"; =20 if (migrate_start(&from, &to, &args->start)) { return -1; @@ -849,7 +842,7 @@ int test_precopy_common(MigrateCommon *args) data_hook =3D args->start_hook(from, to); } =20 - migrate_incoming_qmp(to, args->listen_uri, NULL, "{}"); + migrate_incoming_qmp(to, listen_uri, NULL, "{}"); =20 /* Wait for the first serial output from the source */ if (args->result =3D=3D MIG_TEST_SUCCEED) { @@ -879,11 +872,11 @@ int test_precopy_common(MigrateCommon *args) } =20 if (args->result =3D=3D MIG_TEST_QMP_ERROR) { - migrate_qmp_fail(from, args->connect_uri, channels, "{}"); + migrate_qmp_fail(from, args->uri, channels, "{}"); goto finish; } =20 - migrate_qmp(from, to, args->connect_uri, channels, "{}"); + migrate_qmp(from, to, args->uri, channels, "{}"); =20 if (args->result !=3D MIG_TEST_SUCCEED) { bool allow_active =3D args->result =3D=3D MIG_TEST_FAIL; @@ -947,7 +940,7 @@ void test_precopy_unix_common(MigrateCommon *args) { g_autofree char *uri =3D g_strdup_printf("unix:%s/migsocket", tmpfs); =20 - args->listen_uri =3D uri; + args->uri =3D uri; test_precopy_common(args); } =20 @@ -994,9 +987,9 @@ void test_file_common(MigrateCommon *args, bool stop_sr= c) return; } =20 - if (!args->connect_uri) { + if (!args->uri) { uri =3D g_strdup_printf("file:%s/%s", tmpfs, FILE_TEST_FILENAME); - args->connect_uri =3D uri; + args->uri =3D uri; } =20 /* @@ -1006,7 +999,7 @@ void test_file_common(MigrateCommon *args, bool stop_s= rc) */ g_assert_false(args->live); =20 - if (g_strrstr(args->connect_uri, "offset=3D")) { + if (g_strrstr(args->uri, "offset=3D")) { check_offset =3D true; /* * This comes before the start_hook because it's equivalent to @@ -1029,18 +1022,18 @@ void test_file_common(MigrateCommon *args, bool sto= p_src) } =20 if (args->result =3D=3D MIG_TEST_QMP_ERROR) { - migrate_qmp_fail(from, args->connect_uri, NULL, "{}"); + migrate_qmp_fail(from, args->uri, NULL, "{}"); goto finish; } =20 - migrate_qmp(from, to, args->connect_uri, NULL, "{}"); + migrate_qmp(from, to, args->uri, NULL, "{}"); wait_for_migration_complete(from); =20 /* * We need to wait for the source to finish before starting the * destination. */ - migrate_incoming_qmp(to, args->connect_uri, NULL, "{}"); + migrate_incoming_qmp(to, args->uri, NULL, "{}"); wait_for_migration_complete(to); =20 if (stop_src) { diff --git a/tests/qtest/migration/framework.h b/tests/qtest/migration/fram= ework.h index 65d3912fda..eceb40abbf 100644 --- a/tests/qtest/migration/framework.h +++ b/tests/qtest/migration/framework.h @@ -162,16 +162,14 @@ typedef struct { /* Optional: fine tune start parameters */ MigrateStart start; =20 - /* Required: the URI for the dst QEMU to listen on */ - const char *listen_uri; - /* - * Optional: the URI for the src QEMU to connect to - * If NULL, then it will query the dst QEMU for its actual - * listening address and use that as the connect address. - * This allows for dynamically picking a free TCP port. + * Optional: the migration URI. If NULL, the common code should + * provide a default. For socket migration, the source QEMU may + * query the dst QEMU for the listening address and use that as + * the connection address. This allows for dynamically picking a + * free TCP port. */ - const char *connect_uri; + const char *uri; =20 /* * Optional: JSON-formatted list of src QEMU URIs. If a port is diff --git a/tests/qtest/migration/misc-tests.c b/tests/qtest/migration/mis= c-tests.c index e5d5fc4959..ec6d438cdc 100644 --- a/tests/qtest/migration/misc-tests.c +++ b/tests/qtest/migration/misc-tests.c @@ -196,7 +196,7 @@ static void do_test_validate_uri_channel(MigrateCommon = *args) channels =3D args->connect_channels ? qobject_from_json(args->connect_channels, &error_abort) : NULL; - migrate_qmp_fail(from, args->connect_uri, channels, "{}"); + migrate_qmp_fail(from, args->uri, channels, "{}"); =20 migrate_end(from, to, false); } @@ -252,7 +252,7 @@ static void test_validate_caps_pair(char *test_path, Mi= grateCommon *args) =20 static void test_validate_uri_channels_both_set(char *name, MigrateCommon = *args) { - args->connect_uri =3D "tcp:127.0.0.1:0", + args->uri =3D "tcp:127.0.0.1:0", args->connect_channels =3D ("[ { ""'channel-type': 'main'," " 'addr': { 'transport': 'socket'," " 'type': 'inet'," diff --git a/tests/qtest/migration/precopy-tests.c b/tests/qtest/migration/= precopy-tests.c index a9381fa3bf..55ad77ef0d 100644 --- a/tests/qtest/migration/precopy-tests.c +++ b/tests/qtest/migration/precopy-tests.c @@ -161,7 +161,7 @@ static void __test_precopy_rdma_plain(MigrateCommon *ar= gs, bool ipv6) **/ g_autofree char *uri =3D g_strdup_printf("rdma:%s:29200", buffer); =20 - args->listen_uri =3D uri; + args->uri =3D uri; =20 test_precopy_common(args); } @@ -253,7 +253,7 @@ static void migrate_hook_end_fd(QTestState *from, =20 static void test_precopy_fd_socket(char *name, MigrateCommon *args) { - args->listen_uri =3D "fd:fd-mig"; + args->uri =3D "fd:fd-mig"; args->start_hook =3D migrate_hook_start_fd; args->end_hook =3D migrate_hook_end_fd; =20 @@ -1026,7 +1026,7 @@ static void test_dirty_limit(char *name, MigrateCommo= n *args) args->start.hide_stderr =3D true; args->start.use_dirty_ring =3D true; =20 - args->connect_uri =3D uri; + args->uri =3D uri; =20 /* Start src, dst vm */ if (migrate_start(&from, &to, &args->start)) { @@ -1037,8 +1037,8 @@ static void test_dirty_limit(char *name, MigrateCommo= n *args) migrate_dirty_limit_wait_showup(from, dirtylimit_period, dirtylimit_va= lue); =20 /* Start migrate */ - migrate_incoming_qmp(to, args->connect_uri, NULL, "{}"); - migrate_qmp(from, to, args->connect_uri, NULL, "{}"); + migrate_incoming_qmp(to, args->uri, NULL, "{}"); + migrate_qmp(from, to, args->uri, NULL, "{}"); =20 /* Wait for dirty limit throttle begin */ throttle_us_per_full =3D 0; @@ -1070,8 +1070,7 @@ static void test_dirty_limit(char *name, MigrateCommo= n *args) /* Assert dirty limit is not in service */ g_assert_cmpint(throttle_us_per_full, =3D=3D, 0); =20 - args->listen_uri =3D uri; - args->connect_uri =3D uri; + args->uri =3D uri; =20 args->start.only_target =3D true; args->start.use_dirty_ring =3D true; @@ -1082,8 +1081,8 @@ static void test_dirty_limit(char *name, MigrateCommo= n *args) } =20 /* Start migrate */ - migrate_incoming_qmp(to, args->listen_uri, NULL, "{}"); - migrate_qmp(from, to, args->connect_uri, NULL, "{}"); + migrate_incoming_qmp(to, args->uri, NULL, "{}"); + migrate_qmp(from, to, args->uri, NULL, "{}"); =20 /* Wait for dirty limit throttle begin */ throttle_us_per_full =3D 0; diff --git a/tests/qtest/migration/tls-tests.c b/tests/qtest/migration/tls-= tests.c index f45f4c4b0c..827cc7bcf8 100644 --- a/tests/qtest/migration/tls-tests.c +++ b/tests/qtest/migration/tls-tests.c @@ -436,7 +436,7 @@ static void test_precopy_unix_tls_x509_default_host(cha= r *name, { g_autofree char *uri =3D g_strdup_printf("unix:%s/migsocket", tmpfs); =20 - args->listen_uri =3D uri; + args->uri =3D uri; args->start_hook =3D migrate_hook_start_tls_x509_default_host; args->end_hook =3D migrate_hook_end_tls_x509; args->result =3D MIG_TEST_FAIL; --=20 2.51.0