From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id 6C89BD6E2B7 for ; Thu, 18 Dec 2025 22:43:25 +0000 (UTC) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1vWMhq-00014H-F9; Thu, 18 Dec 2025 17:42:46 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1vWMho-00013Y-C9 for qemu-devel@nongnu.org; Thu, 18 Dec 2025 17:42:44 -0500 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 1vWMhm-0003BY-Ka for qemu-devel@nongnu.org; Thu, 18 Dec 2025 17:42:44 -0500 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 61B8E5BD40; Thu, 18 Dec 2025 22:42:39 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=suse.de; s=susede2_rsa; t=1766097759; h=from:from:reply-to:date:date:message-id:message-id:to:to:cc:cc: mime-version:mime-version:content-type:content-type: in-reply-to:in-reply-to:references:references; bh=nKENjwZ1mG+iN9aXXiyZKAfuE9QVrjg23zWrJ5QOIJY=; b=sN++2M6A6HxMpJxYBd8uUYYT7Ua4ysJA4mPlwlyPZ/yPUMSDxAC4wanaz2kYQLe4hpIPxS CtgR8S8ojmrW+rWDCL19h/bW3U/k/MOgN8JIkmAhSLskssbrPViBSPNuWiqmRxjxM4tzeU 6EYEUzesPbepU6spab/Z2qr2lQYwqec= DKIM-Signature: v=1; a=ed25519-sha256; c=relaxed/relaxed; d=suse.de; s=susede2_ed25519; t=1766097759; h=from:from:reply-to:date:date:message-id:message-id:to:to:cc:cc: mime-version:mime-version:content-type:content-type: in-reply-to:in-reply-to:references:references; bh=nKENjwZ1mG+iN9aXXiyZKAfuE9QVrjg23zWrJ5QOIJY=; b=vAlMZVJPTuzU82YpijXWUeCQ5GmHNIIXubBPnvmboS9wVffALPmSVJGfVoCj327OguhOaf PQAUebjI9qBBJPDw== Authentication-Results: smtp-out2.suse.de; none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=suse.de; s=susede2_rsa; t=1766097759; h=from:from:reply-to:date:date:message-id:message-id:to:to:cc:cc: mime-version:mime-version:content-type:content-type: in-reply-to:in-reply-to:references:references; bh=nKENjwZ1mG+iN9aXXiyZKAfuE9QVrjg23zWrJ5QOIJY=; b=sN++2M6A6HxMpJxYBd8uUYYT7Ua4ysJA4mPlwlyPZ/yPUMSDxAC4wanaz2kYQLe4hpIPxS CtgR8S8ojmrW+rWDCL19h/bW3U/k/MOgN8JIkmAhSLskssbrPViBSPNuWiqmRxjxM4tzeU 6EYEUzesPbepU6spab/Z2qr2lQYwqec= DKIM-Signature: v=1; a=ed25519-sha256; c=relaxed/relaxed; d=suse.de; s=susede2_ed25519; t=1766097759; h=from:from:reply-to:date:date:message-id:message-id:to:to:cc:cc: mime-version:mime-version:content-type:content-type: in-reply-to:in-reply-to:references:references; bh=nKENjwZ1mG+iN9aXXiyZKAfuE9QVrjg23zWrJ5QOIJY=; b=vAlMZVJPTuzU82YpijXWUeCQ5GmHNIIXubBPnvmboS9wVffALPmSVJGfVoCj327OguhOaf PQAUebjI9qBBJPDw== 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 CB7FA3EA63; Thu, 18 Dec 2025 22:42:38 +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 TtccI16DRGlHcgAAD6G6ig (envelope-from ); Thu, 18 Dec 2025 22:42:38 +0000 From: Fabiano Rosas To: Peter Xu Cc: qemu-devel@nongnu.org, berrange@redhat.com, armbru@redhat.com, Laurent Vivier , Paolo Bonzini Subject: Re: [PATCH v3 44/51] tests/qtest/migration: Convert TLS PSK tests to use config In-Reply-To: References: <20251215220041.12657-1-farosas@suse.de> <20251215220041.12657-45-farosas@suse.de> Date: Thu, 18 Dec 2025 19:42:36 -0300 Message-ID: <87zf7fza1v.fsf@suse.de> MIME-Version: 1.0 Content-Type: text/plain X-Spamd-Result: default: False [-4.30 / 50.00]; BAYES_HAM(-3.00)[100.00%]; NEURAL_HAM_LONG(-1.00)[-1.000]; NEURAL_HAM_SHORT(-0.20)[-0.993]; MIME_GOOD(-0.10)[text/plain]; ARC_NA(0.00)[]; MISSING_XM_UA(0.00)[]; RCVD_TLS_ALL(0.00)[]; MIME_TRACE(0.00)[0:+]; RCVD_VIA_SMTP_AUTH(0.00)[]; TO_DN_SOME(0.00)[]; FUZZY_RATELIMITED(0.00)[rspamd.com]; MID_RHS_MATCH_FROM(0.00)[]; DKIM_SIGNED(0.00)[suse.de:s=susede2_rsa,suse.de:s=susede2_ed25519]; FROM_HAS_DN(0.00)[]; RCPT_COUNT_FIVE(0.00)[6]; FROM_EQ_ENVFROM(0.00)[]; TO_MATCH_ENVRCPT_ALL(0.00)[]; RCVD_COUNT_TWO(0.00)[2]; DBL_BLOCKED_OPENRESOLVER(0.00)[imap1.dmz-prg2.suse.org:helo, suse.de:mid, suse.de:email] 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, RCVD_IN_VALIDITY_RPBL_BLOCKED=0.001, RCVD_IN_VALIDITY_SAFE_BLOCKED=0.001, 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: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org Sender: qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org Peter Xu writes: > On Mon, Dec 15, 2025 at 07:00:30PM -0300, Fabiano Rosas wrote: >> Replace calls to migrate_set_parameters and the usage of args.caps >> with the new config object API. >> >> The multifd tests are now the same as the "precopy" tests, only >> setting some multifd options, so reuse the precopy code. >> >> Temporarily, set the use-config key to enable the new method. >> >> Signed-off-by: Fabiano Rosas >> --- >> tests/qtest/migration/tls-tests.c | 72 +++++++++---------------------- >> 1 file changed, 20 insertions(+), 52 deletions(-) >> >> diff --git a/tests/qtest/migration/tls-tests.c b/tests/qtest/migration/tls-tests.c >> index abd6bf9281..68304a7af3 100644 >> --- a/tests/qtest/migration/tls-tests.c >> +++ b/tests/qtest/migration/tls-tests.c >> @@ -73,9 +73,6 @@ static void *migrate_hook_start_tls_psk_common(QTestState *from, >> " 'dir': %s } }", >> args->mismatch ? workdiralt : workdir); >> >> - migrate_set_parameter_str(from, "tls-creds", "tlscredspsk0"); >> - migrate_set_parameter_str(to, "tls-creds", "tlscredspsk0"); >> - >> return NULL; >> } >> >> @@ -121,6 +118,11 @@ static void test_precopy_tls_psk_common(MigrateCommon *args, >> { >> TestMigrateTLSPSKData *data = g_new0(TestMigrateTLSPSKData, 1); >> >> + /* temporary */ >> + qdict_put_bool(args->start.config, "use-config", true); >> + >> + qdict_put_str(args->start.config, "tls-creds", "tlscredspsk0"); >> + >> migrate_tls_psk_init(args, test_args, data); >> test_precopy_common(args); >> migrate_tls_psk_cleanup(data); >> @@ -497,18 +499,11 @@ static void test_precopy_tcp_tls_psk_mismatch(char *name, MigrateCommon *args) >> test_precopy_tls_psk_common(args, &tls_psk_mismatch); >> } >> >> -static void *migrate_hook_start_no_tls(QTestState *from, QTestState *to) >> -{ >> - migrate_set_parameter_null(from, "tls-creds"); >> - migrate_set_parameter_null(to, "tls-creds"); >> - >> - return NULL; >> -} >> - >> static void test_precopy_tcp_no_tls(char *name, MigrateCommon *args) >> { >> args->listen_uri = "tcp:127.0.0.1:0"; >> - args->start_hook = migrate_hook_start_no_tls; >> + >> + qdict_put_null(args->start.config, "tls-creds"); >> >> test_precopy_common(args); >> } >> @@ -614,29 +609,7 @@ static void test_precopy_tcp_tls_x509_reject_anon_client(char *name, >> >> test_precopy_tls_x509_common(args, &tls_x509_reject_anon_client); >> } >> -#endif /* CONFIG_TASN1 */ >> >> -static void * >> -migrate_hook_start_multifd_tcp_tls_psk_match(QTestState *from, >> - QTestState *to) >> -{ >> - migrate_set_parameter_str(from, "multifd-compression", "none"); >> - migrate_set_parameter_str(to, "multifd-compression", "none"); >> - >> - return migrate_hook_start_tls_psk_common(from, to, &tls_psk_match); >> -} >> - >> -static void * >> -migrate_hook_start_multifd_tcp_tls_psk_mismatch(QTestState *from, >> - QTestState *to) >> -{ >> - migrate_set_parameter_str(from, "multifd-compression", "none"); >> - migrate_set_parameter_str(to, "multifd-compression", "none"); >> - >> - return migrate_hook_start_tls_psk_common(from, to, &tls_psk_mismatch); >> -} >> - >> -#ifdef CONFIG_TASN1 >> static void * >> migrate_hook_start_multifd_tls_x509_default_host(QTestState *from, >> QTestState *to) >> @@ -694,39 +667,34 @@ migrate_hook_start_multifd_tls_x509_reject_anon_client(QTestState *from, >> >> static void test_multifd_tcp_tls_psk_match(char *name, MigrateCommon *args) >> { >> - args->start_hook = migrate_hook_start_multifd_tcp_tls_psk_match; >> - args->listen_uri = "tcp:127.0.0.1:0"; >> - >> args->start.incoming_defer = true; >> - args->start.caps[MIGRATION_CAPABILITY_MULTIFD] = true; >> >> - test_precopy_tls_psk_common(args, &tls_psk_match); >> + qdict_put_str(args->start.config, "multifd-compression", "none"); >> + qdict_put_bool(args->start.config, "multifd", true); >> + >> + test_precopy_tcp_tls_psk_match(name, args); >> } >> >> static void test_multifd_tcp_tls_psk_mismatch(char *name, MigrateCommon *args) >> { >> - args->start_hook = migrate_hook_start_multifd_tcp_tls_psk_mismatch; >> - args->result = MIG_TEST_FAIL; >> - args->listen_uri = "tcp:127.0.0.1:0"; >> - >> - args->start.hide_stderr = true; >> args->start.incoming_defer = true; >> - args->start.caps[MIGRATION_CAPABILITY_MULTIFD] = true; >> >> - test_precopy_tls_psk_common(args, &tls_psk_mismatch); >> + qdict_put_str(args->start.config, "multifd-compression", "none"); > > Why do we need to start set multifd-compression=none all the time > (including all below tests)? Isn't that the default anyway? > Because patch 43 removed the hook. I haven't thought about it being default, I guess I can just remove it then.