From nobody Sat Nov 23 20:11:29 2024 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=1731527337; cv=none; d=zohomail.com; s=zohoarc; b=G/X2gBfmPac7tfBZCupuWcm8av1/HMlH2jpJURfdRLf1rzbxwQ6yp49s9oX/Bg8l9xCpdOl7ouXl6TeWU/lMvInG5zZwMDriOpxGx2XAxka6kGzzmWipDutxB4ehMrcanYmEJownuCYRC+5kW03z2n88F+bL3ojBmBtmjAHdLAw= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1731527337; 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=R9V+hcEbvtHnJkrSVqUVoRpyYrllLP7mne+ouHQJg5c=; b=TJH9oDipXcyren2BrmV128B0cYPFf37moTExqeADZUpxzCrY5reUMYSpkEcHuObHwGltauFVWVcolg00p9isRkVprFgEMxtElyOhtE+KgzaLMee3A1BJnwaWfTGP6oLjKKkhowai9u8E71b4cvFBVLoD1WItV6OQtqs9s+kPtrw= 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 lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1731527337177536.7832943273252; Wed, 13 Nov 2024 11:48:57 -0800 (PST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1tBJKB-0006Jc-N4; Wed, 13 Nov 2024 14:46:47 -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 1tBJK9-0006IQ-8k for qemu-devel@nongnu.org; Wed, 13 Nov 2024 14:46:45 -0500 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 1tBJK6-00038B-Ia for qemu-devel@nongnu.org; Wed, 13 Nov 2024 14:46:44 -0500 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 2CDDE1F44E; Wed, 13 Nov 2024 19:46:41 +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 7FFF613301; Wed, 13 Nov 2024 19:46: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 KDUUER8CNWfLcQAAD6G6ig (envelope-from ); Wed, 13 Nov 2024 19:46:39 +0000 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=suse.de; s=susede2_rsa; t=1731527201; 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=R9V+hcEbvtHnJkrSVqUVoRpyYrllLP7mne+ouHQJg5c=; b=XNP5ehwk6Yl+bQ1XawCQ6Zaif5Hvr4iq1XwIcn6AwT/oyn9BllzH82dgkr9bBMlJ8CVt1q 81DV4UW561k1Kv3bF+6o8bxNN/lcappRan3DPun/TDdxeLZKUXe1+m3VQHeFfGBCVchrtT E8y3McC2vwzaCWFmkP2c94tuUQWH/d4= DKIM-Signature: v=1; a=ed25519-sha256; c=relaxed/relaxed; d=suse.de; s=susede2_ed25519; t=1731527201; 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=R9V+hcEbvtHnJkrSVqUVoRpyYrllLP7mne+ouHQJg5c=; b=5WQmrzAGBmssfoYiuELZd1A9p/eIaI7grBVUmI2esj+SsrzczGAqyAeftuh0d/rQVaWaAV KykHkTSMDIlR6FBw== Authentication-Results: smtp-out2.suse.de; dkim=pass header.d=suse.de header.s=susede2_rsa header.b=XNP5ehwk; dkim=pass header.d=suse.de header.s=susede2_ed25519 header.b=5WQmrzAG DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=suse.de; s=susede2_rsa; t=1731527201; 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=R9V+hcEbvtHnJkrSVqUVoRpyYrllLP7mne+ouHQJg5c=; b=XNP5ehwk6Yl+bQ1XawCQ6Zaif5Hvr4iq1XwIcn6AwT/oyn9BllzH82dgkr9bBMlJ8CVt1q 81DV4UW561k1Kv3bF+6o8bxNN/lcappRan3DPun/TDdxeLZKUXe1+m3VQHeFfGBCVchrtT E8y3McC2vwzaCWFmkP2c94tuUQWH/d4= DKIM-Signature: v=1; a=ed25519-sha256; c=relaxed/relaxed; d=suse.de; s=susede2_ed25519; t=1731527201; 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=R9V+hcEbvtHnJkrSVqUVoRpyYrllLP7mne+ouHQJg5c=; b=5WQmrzAGBmssfoYiuELZd1A9p/eIaI7grBVUmI2esj+SsrzczGAqyAeftuh0d/rQVaWaAV KykHkTSMDIlR6FBw== From: Fabiano Rosas To: qemu-devel@nongnu.org Cc: Peter Xu , Peter Maydell , =?UTF-8?q?Daniel=20P=20=2E=20Berrang=C3=A9?= , =?UTF-8?q?Alex=20Benn=C3=A9e?= Subject: [PATCH v2 03/22] tests/qtest/migration: Stop calling everything "test" Date: Wed, 13 Nov 2024 16:46:11 -0300 Message-Id: <20241113194630.3385-4-farosas@suse.de> X-Mailer: git-send-email 2.35.3 In-Reply-To: <20241113194630.3385-1-farosas@suse.de> References: <20241113194630.3385-1-farosas@suse.de> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable X-Rspamd-Queue-Id: 2CDDE1F44E 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)[]; MIME_TRACE(0.00)[0:+]; FUZZY_BLOCKED(0.00)[rspamd.com]; DKIM_SIGNED(0.00)[suse.de:s=susede2_rsa,suse.de:s=susede2_ed25519]; TO_DN_SOME(0.00)[]; RBL_SPAMHAUS_BLOCKED_OPENRESOLVER(0.00)[2a07:de40:b281:104:10:150:64:97:from]; SPAMHAUS_XBL(0.00)[2a07:de40:b281:104:10:150:64:97:from]; ARC_NA(0.00)[]; RCVD_COUNT_TWO(0.00)[2]; TO_MATCH_ENVRCPT_ALL(0.00)[]; FROM_HAS_DN(0.00)[]; RCVD_VIA_SMTP_AUTH(0.00)[]; RECEIVED_SPAMHAUS_BLOCKED_OPENRESOLVER(0.00)[2a07:de40:b281:106:10:150:64:167:received]; FROM_EQ_ENVFROM(0.00)[]; ASN(0.00)[asn:25478, ipnet:::/0, country:RU]; RCVD_TLS_ALL(0.00)[]; DKIM_TRACE(0.00)[suse.de:+]; RCPT_COUNT_FIVE(0.00)[5]; DBL_BLOCKED_OPENRESOLVER(0.00)[imap1.dmz-prg2.suse.org:helo, imap1.dmz-prg2.suse.org:rdns, suse.de:email, suse.de:dkim, suse.de:mid] X-Rspamd-Server: rspamd2.dmz-prg2.suse.org X-Rspamd-Action: no action 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=lists.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, RCVD_IN_DNSWL_NONE=-0.0001, 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+importer=patchew.org@nongnu.org Sender: qemu-devel-bounces+importer=patchew.org@nongnu.org X-ZohoMail-DKIM: pass (identity @suse.de) X-ZM-MESSAGEID: 1731527339188116600 Content-Type: text/plain; charset="utf-8" Test frameworks usually prefix "test_" to the entry point of the test code. Having every function prefixed with test_ makes it hard to understand the code and to grep for the actual tests. Remove the "test" prefix from everything that is not a test. In order to still keep some namespacing, stick to the "migrate_" prefix, which is the most used currently. Signed-off-by: Fabiano Rosas --- note: I would prefer the prefix "mig_" to avoid using "migrate_" which is a verb, but several functions such as migrate_qmp() would have to be given an entirely new name to keep expressiveness and I want to keep this a mechanical change. --- tests/qtest/migration-test.c | 72 ++++++++++++++++++------------------ 1 file changed, 36 insertions(+), 36 deletions(-) diff --git a/tests/qtest/migration-test.c b/tests/qtest/migration-test.c index 68fa24edb4..74df687c78 100644 --- a/tests/qtest/migration-test.c +++ b/tests/qtest/migration-test.c @@ -710,8 +710,8 @@ typedef struct { PostcopyRecoveryFailStage postcopy_recovery_fail_stage; } MigrateCommon; =20 -static int test_migrate_start(QTestState **from, QTestState **to, - const char *uri, MigrateStart *args) +static int migrate_start(QTestState **from, QTestState **to, + const char *uri, MigrateStart *args) { g_autofree gchar *arch_source =3D NULL; g_autofree gchar *arch_target =3D NULL; @@ -876,7 +876,7 @@ static int test_migrate_start(QTestState **from, QTestS= tate **to, return 0; } =20 -static void test_migrate_end(QTestState *from, QTestState *to, bool test_d= est) +static void migrate_end(QTestState *from, QTestState *to, bool test_dest) { unsigned char dest_byte_a, dest_byte_b, dest_byte_c, dest_byte_d; =20 @@ -1255,7 +1255,7 @@ static int migrate_postcopy_prepare(QTestState **from= _ptr, { QTestState *from, *to; =20 - if (test_migrate_start(&from, &to, "defer", &args->start)) { + if (migrate_start(&from, &to, "defer", &args->start)) { return -1; } =20 @@ -1319,7 +1319,7 @@ static void migrate_postcopy_complete(QTestState *fro= m, QTestState *to, args->postcopy_data =3D NULL; } =20 - test_migrate_end(from, to, true); + migrate_end(from, to, true); } =20 static void test_postcopy_common(MigrateCommon *args) @@ -1635,12 +1635,12 @@ static void test_baddest(void) }; QTestState *from, *to; =20 - if (test_migrate_start(&from, &to, "tcp:127.0.0.1:0", &args)) { + if (migrate_start(&from, &to, "tcp:127.0.0.1:0", &args)) { return; } migrate_qmp(from, to, "tcp:127.0.0.1:0", NULL, "{}"); wait_for_migration_fail(from, false); - test_migrate_end(from, to, false); + migrate_end(from, to, false); } =20 #ifndef _WIN32 @@ -1661,7 +1661,7 @@ static void test_analyze_script(void) } =20 /* dummy url */ - if (test_migrate_start(&from, &to, "tcp:127.0.0.1:0", &args)) { + if (migrate_start(&from, &to, "tcp:127.0.0.1:0", &args)) { return; } =20 @@ -1693,7 +1693,7 @@ static void test_analyze_script(void) g_test_message("Failed to analyze the migration stream"); g_test_fail(); } - test_migrate_end(from, to, false); + migrate_end(from, to, false); cleanup("migfile"); } #endif @@ -1703,7 +1703,7 @@ static void test_precopy_common(MigrateCommon *args) QTestState *from, *to; void *data_hook =3D NULL; =20 - if (test_migrate_start(&from, &to, args->listen_uri, &args->start)) { + if (migrate_start(&from, &to, args->listen_uri, &args->start)) { return; } =20 @@ -1798,7 +1798,7 @@ finish: args->end_hook(from, to, data_hook); } =20 - test_migrate_end(from, to, args->result =3D=3D MIG_TEST_SUCCEED); + migrate_end(from, to, args->result =3D=3D MIG_TEST_SUCCEED); } =20 static void file_dirty_offset_region(void) @@ -1839,7 +1839,7 @@ static void test_file_common(MigrateCommon *args, boo= l stop_src) void *data_hook =3D NULL; bool check_offset =3D false; =20 - if (test_migrate_start(&from, &to, args->listen_uri, &args->start)) { + if (migrate_start(&from, &to, args->listen_uri, &args->start)) { return; } =20 @@ -1903,7 +1903,7 @@ finish: args->end_hook(from, to, data_hook); } =20 - test_migrate_end(from, to, args->result =3D=3D MIG_TEST_SUCCEED); + migrate_end(from, to, args->result =3D=3D MIG_TEST_SUCCEED); } =20 static void test_precopy_unix_plain(void) @@ -2024,7 +2024,7 @@ static void test_ignore_shared(void) g_autofree char *uri =3D g_strdup_printf("unix:%s/migsocket", tmpfs); QTestState *from, *to; =20 - if (test_migrate_start(&from, &to, uri, false, true, NULL, NULL)) { + if (migrate_start(&from, &to, uri, false, true, NULL, NULL)) { return; } =20 @@ -2051,7 +2051,7 @@ static void test_ignore_shared(void) /* Check whether shared RAM has been really skipped */ g_assert_cmpint(read_ram_property_int(from, "transferred"), <, 1024 * = 1024); =20 - test_migrate_end(from, to, true); + migrate_end(from, to, true); } #endif =20 @@ -2595,7 +2595,7 @@ static void migrate_hook_end_fd(QTestState *from, qobject_unref(rsp); } =20 -static void test_migrate_precopy_fd_socket(void) +static void test_precopy_fd_socket(void) { MigrateCommon args =3D { .listen_uri =3D "defer", @@ -2634,7 +2634,7 @@ static void *migrate_precopy_fd_file_start(QTestState= *from, QTestState *to) return NULL; } =20 -static void test_migrate_precopy_fd_file(void) +static void test_precopy_fd_file(void) { MigrateCommon args =3D { .listen_uri =3D "defer", @@ -2651,7 +2651,7 @@ static void do_test_validate_uuid(MigrateStart *args,= bool should_fail) g_autofree char *uri =3D g_strdup_printf("unix:%s/migsocket", tmpfs); QTestState *from, *to; =20 - if (test_migrate_start(&from, &to, uri, args)) { + if (migrate_start(&from, &to, uri, args)) { return; } =20 @@ -2675,7 +2675,7 @@ static void do_test_validate_uuid(MigrateStart *args,= bool should_fail) wait_for_migration_complete(from); } =20 - test_migrate_end(from, to, false); + migrate_end(from, to, false); } =20 static void test_validate_uuid(void) @@ -2723,7 +2723,7 @@ static void do_test_validate_uri_channel(MigrateCommo= n *args) { QTestState *from, *to; =20 - if (test_migrate_start(&from, &to, args->listen_uri, &args->start)) { + if (migrate_start(&from, &to, args->listen_uri, &args->start)) { return; } =20 @@ -2735,7 +2735,7 @@ static void do_test_validate_uri_channel(MigrateCommo= n *args) * starts. */ migrate_qmp_fail(from, args->connect_uri, args->connect_channels, "{}"= ); - test_migrate_end(from, to, false); + migrate_end(from, to, false); } =20 static void test_validate_uri_channels_both_set(void) @@ -2783,7 +2783,7 @@ static void test_validate_uri_channels_none_set(void) * To make things even worse, we need to run the initial stage at * 3MB/s so we enter autoconverge even when host is (over)loaded. */ -static void test_migrate_auto_converge(void) +static void test_auto_converge(void) { g_autofree char *uri =3D g_strdup_printf("unix:%s/migsocket", tmpfs); MigrateStart args =3D {}; @@ -2799,7 +2799,7 @@ static void test_migrate_auto_converge(void) uint64_t prev_dirty_sync_cnt, dirty_sync_cnt; int max_try_count, hit =3D 0; =20 - if (test_migrate_start(&from, &to, uri, &args)) { + if (migrate_start(&from, &to, uri, &args)) { return; } =20 @@ -2883,7 +2883,7 @@ static void test_migrate_auto_converge(void) wait_for_serial("dest_serial"); wait_for_migration_complete(from); =20 - test_migrate_end(from, to, true); + migrate_end(from, to, true); } =20 static void * @@ -3274,7 +3274,7 @@ static void test_multifd_tcp_cancel(void) }; QTestState *from, *to, *to2; =20 - if (test_migrate_start(&from, &to, "defer", &args)) { + if (migrate_start(&from, &to, "defer", &args)) { return; } =20 @@ -3306,7 +3306,7 @@ static void test_multifd_tcp_cancel(void) =20 /* * Ensure the source QEMU finishes its cancellation process before we - * proceed with the setup of the next migration. The test_migrate_star= t() + * proceed with the setup of the next migration. The migrate_start() * function and others might want to interact with the source in a way= that * is not possible while the migration is not canceled properly. For * example, setting migration capabilities when the migration is still @@ -3318,7 +3318,7 @@ static void test_multifd_tcp_cancel(void) .only_target =3D true, }; =20 - if (test_migrate_start(&from, &to2, "defer", &args)) { + if (migrate_start(&from, &to2, "defer", &args)) { return; } =20 @@ -3342,7 +3342,7 @@ static void test_multifd_tcp_cancel(void) =20 wait_for_serial("dest_serial"); wait_for_migration_complete(from); - test_migrate_end(from, to2, true); + migrate_end(from, to2, true); } =20 static void calc_dirty_rate(QTestState *who, uint64_t calc_time) @@ -3628,7 +3628,7 @@ static void migrate_dirty_limit_wait_showup(QTestStat= e *from, * And see if dirty limit migration works correctly. * This test case involves many passes, so it runs in slow mode only. */ -static void test_migrate_dirty_limit(void) +static void test_dirty_limit(void) { g_autofree char *uri =3D g_strdup_printf("unix:%s/migsocket", tmpfs); QTestState *from, *to; @@ -3659,7 +3659,7 @@ static void test_migrate_dirty_limit(void) }; =20 /* Start src, dst vm */ - if (test_migrate_start(&from, &to, args.listen_uri, &args.start)) { + if (migrate_start(&from, &to, args.listen_uri, &args.start)) { return; } =20 @@ -3705,7 +3705,7 @@ static void test_migrate_dirty_limit(void) }; =20 /* Restart dst vm, src vm already show up so we needn't wait anymore */ - if (test_migrate_start(&from, &to, args.listen_uri, &args.start)) { + if (migrate_start(&from, &to, args.listen_uri, &args.start)) { return; } =20 @@ -3749,7 +3749,7 @@ static void test_migrate_dirty_limit(void) wait_for_serial("dest_serial"); wait_for_migration_complete(from); =20 - test_migrate_end(from, to, true); + migrate_end(from, to, true); } =20 static bool kvm_dirty_ring_supported(void) @@ -3952,9 +3952,9 @@ int main(int argc, char **argv) /* migration_test_add("/migration/ignore_shared", test_ignore_shared);= */ #ifndef _WIN32 migration_test_add("/migration/precopy/fd/tcp", - test_migrate_precopy_fd_socket); + test_precopy_fd_socket); migration_test_add("/migration/precopy/fd/file", - test_migrate_precopy_fd_file); + test_precopy_fd_file); #endif migration_test_add("/migration/validate_uuid", test_validate_uuid); migration_test_add("/migration/validate_uuid_error", @@ -3972,11 +3972,11 @@ int main(int argc, char **argv) */ if (g_test_slow()) { migration_test_add("/migration/auto_converge", - test_migrate_auto_converge); + test_auto_converge); if (g_str_equal(arch, "x86_64") && has_kvm && kvm_dirty_ring_supported()) { migration_test_add("/migration/dirty_limit", - test_migrate_dirty_limit); + test_dirty_limit); } } migration_test_add("/migration/multifd/tcp/uri/plain/none", --=20 2.35.3