{"id":2233084,"url":"http://patchwork.ozlabs.org/api/1.2/patches/2233084/?format=json","web_url":"http://patchwork.ozlabs.org/project/qemu-devel/patch/20260505160915.25558-2-farosas@suse.de/","project":{"id":14,"url":"http://patchwork.ozlabs.org/api/1.2/projects/14/?format=json","name":"QEMU Development","link_name":"qemu-devel","list_id":"qemu-devel.nongnu.org","list_email":"qemu-devel@nongnu.org","web_url":"","scm_url":"","webscm_url":"","list_archive_url":"","list_archive_url_format":"","commit_url_format":""},"msgid":"<20260505160915.25558-2-farosas@suse.de>","list_archive_url":null,"date":"2026-05-05T16:09:00","name":"[v1,01/15] tests/qtest/migration: Move cpr transfer logic into cpr-tests.c","commit_ref":null,"pull_url":null,"state":"new","archived":false,"hash":"2355e39c6c7e42835e623958fe2048506a6cc9fb","submitter":{"id":85343,"url":"http://patchwork.ozlabs.org/api/1.2/people/85343/?format=json","name":"Fabiano Rosas","email":"farosas@suse.de"},"delegate":null,"mbox":"http://patchwork.ozlabs.org/project/qemu-devel/patch/20260505160915.25558-2-farosas@suse.de/mbox/","series":[{"id":502864,"url":"http://patchwork.ozlabs.org/api/1.2/series/502864/?format=json","web_url":"http://patchwork.ozlabs.org/project/qemu-devel/list/?series=502864","date":"2026-05-05T16:09:07","name":"tests/qtest/migration: Always defer","version":1,"mbox":"http://patchwork.ozlabs.org/series/502864/mbox/"}],"comments":"http://patchwork.ozlabs.org/api/patches/2233084/comments/","check":"pending","checks":"http://patchwork.ozlabs.org/api/patches/2233084/checks/","tags":{},"related":[],"headers":{"Return-Path":"","X-Original-To":"incoming@patchwork.ozlabs.org","Delivered-To":"patchwork-incoming@legolas.ozlabs.org","Authentication-Results":["legolas.ozlabs.org;\n\tdkim=pass (1024-bit key;\n unprotected) header.d=suse.de header.i=@suse.de header.a=rsa-sha256\n header.s=susede2_rsa header.b=GGDlS1y5;\n\tdkim=pass header.d=suse.de header.i=@suse.de header.a=ed25519-sha256\n header.s=susede2_ed25519 header.b=dBhH98HR;\n\tdkim=pass (1024-bit key) header.d=suse.de header.i=@suse.de\n header.a=rsa-sha256 header.s=susede2_rsa header.b=GGDlS1y5;\n\tdkim=neutral header.d=suse.de header.i=@suse.de header.a=ed25519-sha256\n header.s=susede2_ed25519 header.b=dBhH98HR;\n\tdkim-atps=neutral","legolas.ozlabs.org;\n spf=pass (sender SPF authorized) smtp.mailfrom=nongnu.org\n (client-ip=209.51.188.17; helo=lists1p.gnu.org;\n envelope-from=qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org;\n receiver=patchwork.ozlabs.org)","smtp-out1.suse.de;\n\tnone"],"Received":["from lists1p.gnu.org (lists1p.gnu.org [209.51.188.17])\n\t(using TLSv1.2 with cipher ECDHE-ECDSA-AES256-GCM-SHA384 (256/256 bits))\n\t(No client certificate requested)\n\tby legolas.ozlabs.org (Postfix) with ESMTPS id 4g93R16Y89z1yMh\n\tfor ; Wed, 06 May 2026 02:11:08 +1000 (AEST)","from localhost ([::1] helo=lists1p.gnu.org)\n\tby lists1p.gnu.org with esmtp (Exim 4.90_1)\n\t(envelope-from )\n\tid 1wKIM2-0008Ip-38; Tue, 05 May 2026 12:10:38 -0400","from eggs.gnu.org ([2001:470:142:3::10])\n by lists1p.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256)\n (Exim 4.90_1) (envelope-from ) id 1wKILC-0007w4-Mt\n for qemu-devel@nongnu.org; Tue, 05 May 2026 12:09:47 -0400","from smtp-out1.suse.de ([195.135.223.130])\n by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128)\n (Exim 4.90_1) (envelope-from ) id 1wKIL9-0007RJ-8e\n for qemu-devel@nongnu.org; Tue, 05 May 2026 12:09:46 -0400","from imap1.dmz-prg2.suse.org (unknown [10.150.64.97])\n (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)\n key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest\n SHA256)\n (No client certificate requested)\n by smtp-out1.suse.de (Postfix) with ESMTPS id 884ED6B75F;\n Tue, 5 May 2026 16:09:24 +0000 (UTC)","from imap1.dmz-prg2.suse.org (localhost [127.0.0.1])\n (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)\n key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest\n SHA256)\n (No client certificate requested)\n by imap1.dmz-prg2.suse.org (Postfix) with ESMTPS id 09489593A3;\n Tue, 5 May 2026 16:09:22 +0000 (UTC)","from dovecot-director2.suse.de ([2a07:de40:b281:106:10:150:64:167])\n by imap1.dmz-prg2.suse.org with ESMTPSA id 4LKyMjIW+mmNcgAAD6G6ig\n (envelope-from ); Tue, 05 May 2026 16:09:22 +0000"],"DKIM-Signature":["v=1; a=rsa-sha256; c=relaxed/relaxed; d=suse.de;\n s=susede2_rsa;\n t=1777997364;\n h=from:from:reply-to:date:date:message-id:message-id:to:to:cc:cc:\n mime-version:mime-version:\n content-transfer-encoding:content-transfer-encoding:\n in-reply-to:in-reply-to:references:references;\n bh=j+tsdWsqYD+15JXRDE2F+ieq7bq30O01GxrwVF0GSkI=;\n b=GGDlS1y5r0aYMCh9p2Pg77suxS5OVBfH1HS4c/g4Vwejg3UTdwCj+H4KaylEGwaZG+hmLx\n vs4u9O8oe2o9R/AiVLk+gOUSileViakUNK0/MBEd0tHMgVpw0kP+on6qVkTqNujmc6UK3q\n 159opHCLFFm1stimpvIFDju/+3/3E7U=","v=1; a=ed25519-sha256; c=relaxed/relaxed; d=suse.de;\n s=susede2_ed25519; t=1777997364;\n h=from:from:reply-to:date:date:message-id:message-id:to:to:cc:cc:\n mime-version:mime-version:\n content-transfer-encoding:content-transfer-encoding:\n in-reply-to:in-reply-to:references:references;\n bh=j+tsdWsqYD+15JXRDE2F+ieq7bq30O01GxrwVF0GSkI=;\n b=dBhH98HRaOpUQ3NGzO8Du3Z7UsuvKG6lLi24muv7N6Li6gHUIlsuUSiYk4gtySYAfOncm1\n 2EjPRE0jSKHTvwAA==","v=1; a=rsa-sha256; c=relaxed/relaxed; d=suse.de;\n s=susede2_rsa;\n t=1777997364;\n h=from:from:reply-to:date:date:message-id:message-id:to:to:cc:cc:\n mime-version:mime-version:\n content-transfer-encoding:content-transfer-encoding:\n in-reply-to:in-reply-to:references:references;\n bh=j+tsdWsqYD+15JXRDE2F+ieq7bq30O01GxrwVF0GSkI=;\n b=GGDlS1y5r0aYMCh9p2Pg77suxS5OVBfH1HS4c/g4Vwejg3UTdwCj+H4KaylEGwaZG+hmLx\n vs4u9O8oe2o9R/AiVLk+gOUSileViakUNK0/MBEd0tHMgVpw0kP+on6qVkTqNujmc6UK3q\n 159opHCLFFm1stimpvIFDju/+3/3E7U=","v=1; a=ed25519-sha256; c=relaxed/relaxed; d=suse.de;\n s=susede2_ed25519; t=1777997364;\n h=from:from:reply-to:date:date:message-id:message-id:to:to:cc:cc:\n mime-version:mime-version:\n content-transfer-encoding:content-transfer-encoding:\n in-reply-to:in-reply-to:references:references;\n bh=j+tsdWsqYD+15JXRDE2F+ieq7bq30O01GxrwVF0GSkI=;\n b=dBhH98HRaOpUQ3NGzO8Du3Z7UsuvKG6lLi24muv7N6Li6gHUIlsuUSiYk4gtySYAfOncm1\n 2EjPRE0jSKHTvwAA=="],"From":"Fabiano Rosas ","To":"qemu-devel@nongnu.org","Cc":"Peter Xu , Mark Kanda ,\n Ben Chaney , Laurent Vivier ,\n Paolo Bonzini ","Subject":"[PATCH v1 01/15] tests/qtest/migration: Move cpr transfer logic into\n 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":"8bit","X-Spamd-Result":"default: False [-2.80 / 50.00]; BAYES_HAM(-3.00)[100.00%];\n NEURAL_HAM_LONG(-1.00)[-1.000]; MID_CONTAINS_FROM(1.00)[];\n R_MISSING_CHARSET(0.50)[]; NEURAL_HAM_SHORT(-0.20)[-1.000];\n MIME_GOOD(-0.10)[text/plain]; TO_MATCH_ENVRCPT_ALL(0.00)[];\n FROM_HAS_DN(0.00)[]; ARC_NA(0.00)[]; MIME_TRACE(0.00)[0:+];\n TO_DN_SOME(0.00)[];\n DBL_BLOCKED_OPENRESOLVER(0.00)[imap1.dmz-prg2.suse.org:helo,suse.de:mid,suse.de:email];\n RCVD_VIA_SMTP_AUTH(0.00)[]; FROM_EQ_ENVFROM(0.00)[];\n RCVD_COUNT_TWO(0.00)[2]; FUZZY_RATELIMITED(0.00)[rspamd.com];\n DKIM_SIGNED(0.00)[suse.de:s=susede2_rsa,suse.de:s=susede2_ed25519];\n RCPT_COUNT_FIVE(0.00)[6]; RCVD_TLS_ALL(0.00)[]","X-Spam-Score":"-2.80","Received-SPF":"pass client-ip=195.135.223.130; envelope-from=farosas@suse.de;\n 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,\n DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1,\n RCVD_IN_DNSWL_MED=-2.3, SPF_HELO_NONE=0.001,\n 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":",\n ","List-Archive":"","List-Post":"","List-Help":"","List-Subscribe":",\n ","Errors-To":"qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org","Sender":"qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org"},"content":"There's some amount of cpr-transfer logic at precopy_common, which in\nretrospect was a bad idea. For just two tests, that's too much code to\nbe in the common function. Move it to the cpr file. We'll need this\ncleanup for subsequent improvements.\n\nSigned-off-by: Fabiano Rosas \n---\n tests/qtest/migration/cpr-tests.c | 57 ++++++++++++++++++++++++++++---\n tests/qtest/migration/framework.c | 36 +++----------------\n tests/qtest/migration/framework.h | 3 --\n 3 files changed, 56 insertions(+), 40 deletions(-)","diff":"diff --git a/tests/qtest/migration/cpr-tests.c b/tests/qtest/migration/cpr-tests.c\nindex 63ca5f3996..48c98f0089 100644\n--- a/tests/qtest/migration/cpr-tests.c\n+++ b/tests/qtest/migration/cpr-tests.c\n@@ -15,6 +15,9 @@\n #include \"migration/framework.h\"\n #include \"migration/migration-qmp.h\"\n #include \"migration/migration-util.h\"\n+#include \"qapi/error.h\"\n+#include \"qobject/qjson.h\"\n+#include \"qobject/qlist.h\"\n \n \n static char *tmpfs;\n@@ -42,10 +45,56 @@ static void test_mode_reboot(char *name, MigrateCommon *args)\n test_file_common(args, true);\n }\n \n-static void *test_mode_transfer_start(QTestState *from, QTestState *to)\n+static int test_transfer(MigrateCommon *args, const char *cpr_channel,\n+ bool incoming_defer)\n {\n+ QTestState *from, *to;\n+ QObject *obj, *out_channels = qobject_from_json(args->connect_channels,\n+ &error_abort);\n+ QList *channels_list;\n+\n+ /*\n+ * The cpr channel must be included in outgoing channels, but not in\n+ * migrate-incoming channels.\n+ */\n+ channels_list = qobject_to(QList, out_channels);\n+ obj = migrate_str_to_channel(cpr_channel);\n+ qlist_append(channels_list, obj);\n+\n+ if (migrate_start(&from, &to, args->listen_uri, &args->start)) {\n+ return -1;\n+ }\n+\n migrate_set_parameter_str(from, \"mode\", \"cpr-transfer\");\n- return NULL;\n+\n+ wait_for_serial(\"src_serial\");\n+\n+ qtest_qmp_assert_success(from, \"{ 'execute' : 'stop'}\");\n+ wait_for_stop(from, get_src());\n+ migrate_ensure_converge(from);\n+\n+ migrate_qmp(from, to, NULL, out_channels, \"{}\");\n+\n+ qtest_connect(to);\n+ qtest_qmp_handshake(to, NULL);\n+ if (incoming_defer) {\n+ QObject *in_channels = qobject_from_json(args->connect_channels,\n+ &error_abort);\n+\n+ migrate_incoming_qmp(to, NULL, in_channels, \"{}\");\n+ }\n+\n+ wait_for_migration_complete(from);\n+ wait_for_migration_complete(to);\n+\n+ qtest_qmp_assert_success(to, \"{ 'execute' : 'cont'}\");\n+\n+ wait_for_resume(to, get_dst());\n+ wait_for_serial(\"dest_serial\");\n+\n+ migrate_end(from, to, true);\n+\n+ return 0;\n }\n \n /*\n@@ -86,15 +135,13 @@ static void test_mode_transfer_common(MigrateCommon *args, bool incoming_defer)\n \n args->listen_uri = incoming_defer ? \"defer\" : uri;\n args->connect_channels = connect_channels;\n- args->cpr_channel = cpr_channel;\n- args->start_hook = test_mode_transfer_start;\n \n args->start.opts_source = opts;\n args->start.opts_target = opts_target;\n args->start.defer_target_connect = true;\n args->start.mem_type = MEM_TYPE_MEMFD;\n \n- if (test_precopy_common(args) < 0) {\n+ if (test_transfer(args, cpr_channel, incoming_defer) < 0) {\n close(cpr_sockfd);\n unlink(cpr_path);\n }\ndiff --git a/tests/qtest/migration/framework.c b/tests/qtest/migration/framework.c\nindex 9f71d51f1e..4ef5e1de83 100644\n--- a/tests/qtest/migration/framework.c\n+++ b/tests/qtest/migration/framework.c\n@@ -20,7 +20,6 @@\n #include \"ppc-util.h\"\n #include \"qapi/error.h\"\n #include \"qobject/qjson.h\"\n-#include \"qobject/qlist.h\"\n #include \"qemu/bswap.h\"\n #include \"qemu/module.h\"\n #include \"qemu/option.h\"\n@@ -833,10 +832,7 @@ int test_precopy_common(MigrateCommon *args)\n {\n QTestState *from, *to;\n void *data_hook = NULL;\n- QObject *in_channels = NULL;\n- QObject *out_channels = NULL;\n-\n- g_assert(!args->cpr_channel || args->connect_channels);\n+ QObject *channels = NULL;\n \n if (migrate_start(&from, &to, args->listen_uri, &args->start)) {\n return -1;\n@@ -869,40 +865,16 @@ int test_precopy_common(MigrateCommon *args)\n }\n }\n \n- /*\n- * The cpr channel must be included in outgoing channels, but not in\n- * migrate-incoming channels.\n- */\n if (args->connect_channels) {\n- if (args->start.defer_target_connect &&\n- !strcmp(args->listen_uri, \"defer\")) {\n- in_channels = qobject_from_json(args->connect_channels,\n- &error_abort);\n- }\n- out_channels = qobject_from_json(args->connect_channels, &error_abort);\n-\n- if (args->cpr_channel) {\n- QList *channels_list = qobject_to(QList, out_channels);\n- QObject *obj = migrate_str_to_channel(args->cpr_channel);\n-\n- qlist_append(channels_list, obj);\n- }\n+ channels = qobject_from_json(args->connect_channels, &error_abort);\n }\n \n if (args->result == MIG_TEST_QMP_ERROR) {\n- migrate_qmp_fail(from, args->connect_uri, out_channels, \"{}\");\n+ migrate_qmp_fail(from, args->connect_uri, channels, \"{}\");\n goto finish;\n }\n \n- migrate_qmp(from, to, args->connect_uri, out_channels, \"{}\");\n-\n- if (args->start.defer_target_connect) {\n- qtest_connect(to);\n- qtest_qmp_handshake(to, NULL);\n- if (!strcmp(args->listen_uri, \"defer\")) {\n- migrate_incoming_qmp(to, args->connect_uri, in_channels, \"{}\");\n- }\n- }\n+ migrate_qmp(from, to, args->connect_uri, channels, \"{}\");\n \n if (args->result != MIG_TEST_SUCCEED) {\n bool allow_active = args->result == MIG_TEST_FAIL;\ndiff --git a/tests/qtest/migration/framework.h b/tests/qtest/migration/framework.h\nindex 79604c60f5..13ce84b49e 100644\n--- a/tests/qtest/migration/framework.h\n+++ b/tests/qtest/migration/framework.h\n@@ -180,9 +180,6 @@ typedef struct {\n */\n const char *connect_channels;\n \n- /* Optional: the cpr migration channel, in JSON or dotted keys format */\n- const char *cpr_channel;\n-\n /* Optional: callback to run at start to set migration parameters */\n TestMigrateStartHook start_hook;\n /* Optional: callback to run at finish to cleanup */\n","prefixes":["v1","01/15"]}