{"id":2233094,"url":"http://patchwork.ozlabs.org/api/1.2/patches/2233094/?format=json","web_url":"http://patchwork.ozlabs.org/project/qemu-devel/patch/20260505160915.25558-15-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-15-farosas@suse.de>","list_archive_url":null,"date":"2026-05-05T16:09:13","name":"[v1,14/15] tests/qtest/migration: Stop passing URI into migrate_start","commit_ref":null,"pull_url":null,"state":"new","archived":false,"hash":"2afa17a02c2d8ec400b5aa1bddac6cee768a019b","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-15-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/2233094/comments/","check":"pending","checks":"http://patchwork.ozlabs.org/api/patches/2233094/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=kdJ1x7p/;\n\tdkim=pass header.d=suse.de header.i=@suse.de header.a=ed25519-sha256\n header.s=susede2_ed25519 header.b=zcT2hlNo;\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=kdJ1x7p/;\n\tdkim=neutral header.d=suse.de header.i=@suse.de header.a=ed25519-sha256\n header.s=susede2_ed25519 header.b=zcT2hlNo;\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 4g93SN1xrCz1yJx\n\tfor ; Wed, 06 May 2026 02:12:20 +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 1wKIMr-0000jE-PO; Tue, 05 May 2026 12:11:29 -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 1wKIMU-0000Ip-Pr\n for qemu-devel@nongnu.org; Tue, 05 May 2026 12:11:10 -0400","from smtp-out1.suse.de ([2a07:de40:b251:101:10:150:64:1])\n by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128)\n (Exim 4.90_1) (envelope-from ) id 1wKIMQ-00011s-Bv\n for qemu-devel@nongnu.org; Tue, 05 May 2026 12:11:05 -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 2FCCD6B769;\n Tue, 5 May 2026 16:09:46 +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 76056593A3;\n Tue, 5 May 2026 16:09:44 +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 CAShEUgW+mmNcgAAD6G6ig\n (envelope-from ); Tue, 05 May 2026 16:09:44 +0000"],"DKIM-Signature":["v=1; a=rsa-sha256; c=relaxed/relaxed; d=suse.de;\n s=susede2_rsa;\n t=1777997386;\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=oyZZ68G2Wgyo9Jg2YrN5+k9bAyveWB5OkHRK5G9arB8=;\n b=kdJ1x7p/Y4A7jlgNMZ4Liyhu6eH/CHIHw17OG6XXAKzioycerxm9+I5hWTysdXyFhQDw8F\n 0vNN4LReHYxpofaL5AmxaQjnTWGpyQNYNM/cZVPVuP8wkDWzAjH1qqNiN1pcfHgedu1g2d\n uiUSZZ+SS3tIFjrWsWL1siqLmYaLJxk=","v=1; a=ed25519-sha256; c=relaxed/relaxed; d=suse.de;\n s=susede2_ed25519; t=1777997386;\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=oyZZ68G2Wgyo9Jg2YrN5+k9bAyveWB5OkHRK5G9arB8=;\n b=zcT2hlNoQkVNCeZpIBCJCxaktR5DGj15Cj5LSwz+HjYYJa72BKAHOAYwDA1rjyQ7wXLXyq\n vcue/NWyq1GCQzDg==","v=1; a=rsa-sha256; c=relaxed/relaxed; d=suse.de;\n s=susede2_rsa;\n t=1777997386;\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=oyZZ68G2Wgyo9Jg2YrN5+k9bAyveWB5OkHRK5G9arB8=;\n b=kdJ1x7p/Y4A7jlgNMZ4Liyhu6eH/CHIHw17OG6XXAKzioycerxm9+I5hWTysdXyFhQDw8F\n 0vNN4LReHYxpofaL5AmxaQjnTWGpyQNYNM/cZVPVuP8wkDWzAjH1qqNiN1pcfHgedu1g2d\n uiUSZZ+SS3tIFjrWsWL1siqLmYaLJxk=","v=1; a=ed25519-sha256; c=relaxed/relaxed; d=suse.de;\n s=susede2_ed25519; t=1777997386;\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=oyZZ68G2Wgyo9Jg2YrN5+k9bAyveWB5OkHRK5G9arB8=;\n b=zcT2hlNoQkVNCeZpIBCJCxaktR5DGj15Cj5LSwz+HjYYJa72BKAHOAYwDA1rjyQ7wXLXyq\n vcue/NWyq1GCQzDg=="],"From":"Fabiano Rosas ","To":"qemu-devel@nongnu.org","Cc":"Peter Xu , Lukas Straub ,\n Laurent Vivier , Paolo Bonzini ,\n Mark Kanda , Ben Chaney ","Subject":"[PATCH v1 14/15] tests/qtest/migration: Stop passing URI into\n 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":"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 RCVD_VIA_SMTP_AUTH(0.00)[];\n FUZZY_RATELIMITED(0.00)[rspamd.com]; ARC_NA(0.00)[];\n MIME_TRACE(0.00)[0:+];\n FREEMAIL_CC(0.00)[redhat.com,web.de,oracle.com,akamai.com];\n DBL_BLOCKED_OPENRESOLVER(0.00)[suse.de:mid,suse.de:email,imap1.dmz-prg2.suse.org:helo];\n FROM_HAS_DN(0.00)[]; RCPT_COUNT_SEVEN(0.00)[7];\n RCVD_COUNT_TWO(0.00)[2]; RCVD_TLS_ALL(0.00)[];\n FROM_EQ_ENVFROM(0.00)[]; TO_DN_SOME(0.00)[];\n DKIM_SIGNED(0.00)[suse.de:s=susede2_rsa,suse.de:s=susede2_ed25519];\n FREEMAIL_ENVRCPT(0.00)[web.de]","X-Spam-Score":"-2.80","Received-SPF":"pass client-ip=2a07:de40:b251:101:10:150:64:1;\n 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,\n DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, 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":"Don't allow changing the default -incoming URI via migrate_start. The\ndefault is now -incoming defer. If a test really needs to alter this\n(such as with CPR), the target_opts variable is still available to\nchange the command line.\n\n(aside from the larger goal of using defer, this change is a step\ntowards allowing migrate_start() to be invoked only once for all\ntests)\n\nSigned-off-by: Fabiano Rosas \n---\n tests/qtest/migration/colo-tests.c | 2 +-\n tests/qtest/migration/cpr-tests.c | 6 +++---\n tests/qtest/migration/file-tests.c | 3 +--\n tests/qtest/migration/framework.c | 17 ++++++++---------\n tests/qtest/migration/framework.h | 5 ++---\n tests/qtest/migration/misc-tests.c | 10 +++++-----\n tests/qtest/migration/precopy-tests.c | 12 ++++++------\n 7 files changed, 26 insertions(+), 29 deletions(-)","diff":"diff --git a/tests/qtest/migration/colo-tests.c b/tests/qtest/migration/colo-tests.c\nindex 4add4a014b..a3d27e7bf6 100644\n--- a/tests/qtest/migration/colo-tests.c\n+++ b/tests/qtest/migration/colo-tests.c\n@@ -45,7 +45,7 @@ static int test_colo_common(MigrateCommon *args,\n args->start.caps[MIGRATION_CAPABILITY_RETURN_PATH] = true;\n args->start.caps[MIGRATION_CAPABILITY_X_COLO] = true;\n \n- if (migrate_start(&from, &to, \"defer\", &args->start)) {\n+ if (migrate_start(&from, &to, &args->start)) {\n return -1;\n }\n \ndiff --git a/tests/qtest/migration/cpr-tests.c b/tests/qtest/migration/cpr-tests.c\nindex 9091a84213..fc09dad9c0 100644\n--- a/tests/qtest/migration/cpr-tests.c\n+++ b/tests/qtest/migration/cpr-tests.c\n@@ -60,7 +60,7 @@ static int test_transfer(MigrateCommon *args, const char *cpr_channel,\n obj = migrate_str_to_channel(cpr_channel);\n qlist_append(channels_list, obj);\n \n- if (migrate_start(&from, &to, \"defer\", &args->start)) {\n+ if (migrate_start(&from, &to, &args->start)) {\n return -1;\n }\n \n@@ -179,7 +179,7 @@ static void set_cpr_exec_args(QTestState *who, MigrateCommon *args)\n */\n g_assert(args->start.hide_stderr == false);\n \n- ret = migrate_args(&from_args, &to_args, args->listen_uri, &args->start);\n+ ret = migrate_args(&from_args, &to_args, &args->start);\n g_assert(!ret);\n qtest_from_args = qtest_qemu_args(from_args);\n \n@@ -230,7 +230,7 @@ static void test_cpr_exec(MigrateCommon *args)\n g_autofree char *filename = g_strdup_printf(\"%s/%s\", tmpfs,\n FILE_TEST_FILENAME);\n \n- if (migrate_start(&from, NULL, \"defer\", &args->start)) {\n+ if (migrate_start(&from, NULL, &args->start)) {\n return;\n }\n \ndiff --git a/tests/qtest/migration/file-tests.c b/tests/qtest/migration/file-tests.c\nindex 4b6a2eeb7b..36109d30ba 100644\n--- a/tests/qtest/migration/file-tests.c\n+++ b/tests/qtest/migration/file-tests.c\n@@ -47,8 +47,7 @@ static void test_file_connect_outgoing_fd_leak(char *name, MigrateCommon *args)\n return;\n }\n \n- args->listen_uri = \"defer\";\n- if (migrate_start(&from, &to, args->listen_uri, &args->start)) {\n+ if (migrate_start(&from, &to, &args->start)) {\n return;\n }\n \ndiff --git a/tests/qtest/migration/framework.c b/tests/qtest/migration/framework.c\nindex 9df33f8809..2acbe709b7 100644\n--- a/tests/qtest/migration/framework.c\n+++ b/tests/qtest/migration/framework.c\n@@ -308,7 +308,7 @@ static char *migrate_mem_type_get_opts(MemType type, const char *memory_size)\n return opts;\n }\n \n-int migrate_args(char **from, char **to, const char *uri, MigrateStart *args)\n+int migrate_args(char **from, char **to, MigrateStart *args)\n {\n /* options for source and target */\n g_autofree gchar *arch_opts = NULL;\n@@ -423,11 +423,11 @@ int migrate_args(char **from, char **to, const char *uri, MigrateStart *args)\n \"-name target,debug-threads=on \"\n \"%s \"\n \"-serial file:%s/dest_serial \"\n- \"-incoming %s \"\n+ \"-incoming defer \"\n \"%s %s %s %s\",\n kvm_opts ? kvm_opts : \"\",\n machine, machine_opts,\n- memory_backend, tmpfs, uri,\n+ memory_backend, tmpfs,\n events,\n arch_opts ? arch_opts : \"\",\n args->opts_target ? args->opts_target : \"\",\n@@ -474,8 +474,7 @@ static void migrate_mem_type_cleanup(MemType type)\n }\n }\n \n-int migrate_start(QTestState **from, QTestState **to, const char *uri,\n- MigrateStart *args)\n+int migrate_start(QTestState **from, QTestState **to, MigrateStart *args)\n {\n g_autofree gchar *cmd_source = NULL;\n g_autofree gchar *cmd_target = NULL;\n@@ -490,7 +489,7 @@ int migrate_start(QTestState **from, QTestState **to, const char *uri,\n bootfile_create(qtest_get_arch(), tmpfs, args->suspend_me);\n src_state.suspend_me = args->suspend_me;\n \n- if (migrate_args(&cmd_source, &cmd_target, uri, args)) {\n+ if (migrate_args(&cmd_source, &cmd_target, args)) {\n return -1;\n }\n \n@@ -563,7 +562,7 @@ static int migrate_postcopy_prepare(QTestState **from_ptr,\n args->start.caps[MIGRATION_CAPABILITY_POSTCOPY_BLOCKTIME] = true;\n args->start.caps[MIGRATION_CAPABILITY_POSTCOPY_RAM] = true;\n \n- if (migrate_start(&from, &to, \"defer\", &args->start)) {\n+ if (migrate_start(&from, &to, &args->start)) {\n return -1;\n }\n \n@@ -842,7 +841,7 @@ int test_precopy_common(MigrateCommon *args)\n args->listen_uri = \"tcp:127.0.0.1:0\";\n }\n \n- if (migrate_start(&from, &to, \"defer\", &args->start)) {\n+ if (migrate_start(&from, &to, &args->start)) {\n return -1;\n }\n \n@@ -991,7 +990,7 @@ void test_file_common(MigrateCommon *args, bool stop_src)\n bool check_offset = false;\n g_autofree char *uri = NULL;\n \n- if (migrate_start(&from, &to, \"defer\", &args->start)) {\n+ if (migrate_start(&from, &to, &args->start)) {\n return;\n }\n \ndiff --git a/tests/qtest/migration/framework.h b/tests/qtest/migration/framework.h\nindex 7635e9fac1..65d3912fda 100644\n--- a/tests/qtest/migration/framework.h\n+++ b/tests/qtest/migration/framework.h\n@@ -230,9 +230,8 @@ void wait_for_serial(const char *side);\n void migrate_prepare_for_dirty_mem(QTestState *from);\n void migrate_wait_for_dirty_mem(QTestState *from, QTestState *to);\n \n-int migrate_args(char **from, char **to, const char *uri, MigrateStart *args);\n-int migrate_start(QTestState **from, QTestState **to, const char *uri,\n- MigrateStart *args);\n+int migrate_args(char **from, char **to, MigrateStart *args);\n+int migrate_start(QTestState **from, QTestState **to, MigrateStart *args);\n void migrate_end(QTestState *from, QTestState *to, bool test_dest);\n \n void test_postcopy_common(MigrateCommon *args);\ndiff --git a/tests/qtest/migration/misc-tests.c b/tests/qtest/migration/misc-tests.c\nindex 8216b5d79d..e5d5fc4959 100644\n--- a/tests/qtest/migration/misc-tests.c\n+++ b/tests/qtest/migration/misc-tests.c\n@@ -28,7 +28,7 @@ static void test_baddest(char *name, MigrateCommon *args)\n \n args->start.hide_stderr = true;\n \n- if (migrate_start(&from, &to, \"defer\", &args->start)) {\n+ if (migrate_start(&from, &to, &args->start)) {\n return;\n }\n \n@@ -54,7 +54,7 @@ static void test_analyze_script(char *name, MigrateCommon *args)\n return;\n }\n \n- if (migrate_start(&from, &to, \"defer\", &args->start)) {\n+ if (migrate_start(&from, &to, &args->start)) {\n return;\n }\n \n@@ -115,7 +115,7 @@ static void do_test_validate_uuid(MigrateStart *args, bool should_fail)\n g_autofree char *uri = g_strdup_printf(\"unix:%s/migsocket\", tmpfs);\n QTestState *from, *to;\n \n- if (migrate_start(&from, &to, \"defer\", args)) {\n+ if (migrate_start(&from, &to, args)) {\n return;\n }\n \n@@ -180,7 +180,7 @@ static void do_test_validate_uri_channel(MigrateCommon *args)\n QTestState *from, *to;\n QObject *channels;\n \n- if (migrate_start(&from, &to, \"defer\", &args->start)) {\n+ if (migrate_start(&from, &to, &args->start)) {\n return;\n }\n \n@@ -234,7 +234,7 @@ static void test_validate_caps_pair(char *test_path, MigrateCommon *args)\n args->start.hide_stderr = true;\n args->start.only_source = true;\n \n- if (migrate_start(&from, &to, \"defer\", &args->start)) {\n+ if (migrate_start(&from, &to, &args->start)) {\n return;\n }\n \ndiff --git a/tests/qtest/migration/precopy-tests.c b/tests/qtest/migration/precopy-tests.c\nindex b13e84e26d..a9381fa3bf 100644\n--- a/tests/qtest/migration/precopy-tests.c\n+++ b/tests/qtest/migration/precopy-tests.c\n@@ -291,7 +291,7 @@ static void test_auto_converge(char *name, MigrateCommon *args)\n uint64_t prev_dirty_sync_cnt, dirty_sync_cnt;\n int max_try_count, hit = 0;\n \n- if (migrate_start(&from, &to, \"defer\", &args->start)) {\n+ if (migrate_start(&from, &to, &args->start)) {\n return;\n }\n \n@@ -470,7 +470,7 @@ static void test_multifd_tcp_cancel(MigrateCommon *args, bool postcopy_ram)\n \n args->start.hide_stderr = true;\n \n- if (migrate_start(&from, &to, \"defer\", &args->start)) {\n+ if (migrate_start(&from, &to, &args->start)) {\n return;\n }\n \n@@ -516,7 +516,7 @@ static void test_multifd_tcp_cancel(MigrateCommon *args, bool postcopy_ram)\n \n args->start.only_target = true;\n \n- if (migrate_start(&from, &to2, \"defer\", &args->start)) {\n+ if (migrate_start(&from, &to2, &args->start)) {\n return;\n }\n \n@@ -690,7 +690,7 @@ static void test_cancel_src_after_status(char *test_path, MigrateCommon *args)\n \n args->start.hide_stderr = true;\n \n- if (migrate_start(&from, &to, \"defer\", &args->start)) {\n+ if (migrate_start(&from, &to, &args->start)) {\n return;\n }\n \n@@ -1029,7 +1029,7 @@ static void test_dirty_limit(char *name, MigrateCommon *args)\n args->connect_uri = uri;\n \n /* Start src, dst vm */\n- if (migrate_start(&from, &to, \"defer\", &args->start)) {\n+ if (migrate_start(&from, &to, &args->start)) {\n return;\n }\n \n@@ -1077,7 +1077,7 @@ static void test_dirty_limit(char *name, MigrateCommon *args)\n args->start.use_dirty_ring = true;\n \n /* Restart dst vm, src vm already show up so we needn't wait anymore */\n- if (migrate_start(&from, &to, \"defer\", &args->start)) {\n+ if (migrate_start(&from, &to, &args->start)) {\n return;\n }\n \n","prefixes":["v1","14/15"]}