Remove the migrate_hook_start_precopy_tcp_multifd_common hook and open code its contents in the callers. This will simplify moving the migrate_set_parameters calls in the following patches.
Signed-off-by: Fabiano Rosas <[email protected]> --- tests/qtest/migration/compression-tests.c | 25 ++++++++++++++++---- tests/qtest/migration/framework.c | 10 -------- tests/qtest/migration/framework.h | 4 ---- tests/qtest/migration/precopy-tests.c | 9 +++++--- tests/qtest/migration/tls-tests.c | 28 +++++++++++++++++------ 5 files changed, 47 insertions(+), 29 deletions(-) diff --git a/tests/qtest/migration/compression-tests.c b/tests/qtest/migration/compression-tests.c index bed39dece0..be60981f66 100644 --- a/tests/qtest/migration/compression-tests.c +++ b/tests/qtest/migration/compression-tests.c @@ -28,7 +28,10 @@ migrate_hook_start_precopy_tcp_multifd_zstd(QTestState *from, migrate_set_parameter_int(from, "multifd-zstd-level", 2); migrate_set_parameter_int(to, "multifd-zstd-level", 2); - return migrate_hook_start_precopy_tcp_multifd_common(from, to, "zstd"); + migrate_set_parameter_str(from, "multifd-compression", "zstd"); + migrate_set_parameter_str(to, "multifd-compression", "zstd"); + + return NULL; } static void test_multifd_tcp_zstd(char *name, MigrateCommon *args) @@ -63,7 +66,10 @@ 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); - return migrate_hook_start_precopy_tcp_multifd_common(from, to, "qatzip"); + migrate_set_parameter_str(from, "multifd-compression", "qatzip"); + migrate_set_parameter_str(to, "multifd-compression", "qatzip"); + + return NULL; } static void test_multifd_tcp_qatzip(char *name, MigrateCommon *args) @@ -83,7 +89,10 @@ static void * migrate_hook_start_precopy_tcp_multifd_qpl(QTestState *from, QTestState *to) { - return migrate_hook_start_precopy_tcp_multifd_common(from, to, "qpl"); + migrate_set_parameter_str(from, "multifd-compression", "qpl"); + migrate_set_parameter_str(to, "multifd-compression", "qpl"); + + return NULL; } static void test_multifd_tcp_qpl(char *name, MigrateCommon *args) @@ -103,7 +112,10 @@ static void * migrate_hook_start_precopy_tcp_multifd_uadk(QTestState *from, QTestState *to) { - return migrate_hook_start_precopy_tcp_multifd_common(from, to, "uadk"); + migrate_set_parameter_str(from, "multifd-compression", "uadk"); + migrate_set_parameter_str(to, "multifd-compression", "uadk"); + + return NULL; } static void test_multifd_tcp_uadk(char *name, MigrateCommon *args) @@ -156,7 +168,10 @@ 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); - return migrate_hook_start_precopy_tcp_multifd_common(from, to, "zlib"); + migrate_set_parameter_str(from, "multifd-compression", "zlib"); + migrate_set_parameter_str(to, "multifd-compression", "zlib"); + + return NULL; } static void test_multifd_tcp_zlib(char *name, MigrateCommon *args) diff --git a/tests/qtest/migration/framework.c b/tests/qtest/migration/framework.c index b9bbdca6a9..ecfeee570e 100644 --- a/tests/qtest/migration/framework.c +++ b/tests/qtest/migration/framework.c @@ -1115,16 +1115,6 @@ finish: migrate_end(from, to, args->result == MIG_TEST_SUCCEED); } -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/framework.h index 2584599f14..239fc54f82 100644 --- a/tests/qtest/migration/framework.h +++ b/tests/qtest/migration/framework.h @@ -272,10 +272,6 @@ void test_postcopy_common(MigrateCommon *args); void test_postcopy_recovery_common(MigrateCommon *args); int test_precopy_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); - typedef struct QTestMigrationState QTestMigrationState; QTestMigrationState *get_src(void); QTestMigrationState *get_dst(void); diff --git a/tests/qtest/migration/precopy-tests.c b/tests/qtest/migration/precopy-tests.c index 0b0f04bf19..01151301ce 100644 --- a/tests/qtest/migration/precopy-tests.c +++ b/tests/qtest/migration/precopy-tests.c @@ -452,14 +452,17 @@ static void * migrate_hook_start_precopy_tcp_multifd(QTestState *from, QTestState *to) { - return migrate_hook_start_precopy_tcp_multifd_common(from, to, "none"); + migrate_set_parameter_str(from, "multifd-compression", "none"); + migrate_set_parameter_str(to, "multifd-compression", "none"); + + return NULL; } 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_hook_start_precopy_tcp_multifd(from, to); migrate_set_parameter_str(from, "zero-page-detection", "legacy"); return NULL; } @@ -468,7 +471,7 @@ 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_hook_start_precopy_tcp_multifd(from, to); migrate_set_parameter_str(from, "zero-page-detection", "none"); return NULL; } diff --git a/tests/qtest/migration/tls-tests.c b/tests/qtest/migration/tls-tests.c index aade57f7de..5f561bc602 100644 --- a/tests/qtest/migration/tls-tests.c +++ b/tests/qtest/migration/tls-tests.c @@ -616,7 +616,9 @@ static void * migrate_hook_start_multifd_tcp_tls_psk_match(QTestState *from, QTestState *to) { - migrate_hook_start_precopy_tcp_multifd_common(from, to, "none"); + 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); } @@ -624,7 +626,9 @@ static void * migrate_hook_start_multifd_tcp_tls_psk_mismatch(QTestState *from, QTestState *to) { - migrate_hook_start_precopy_tcp_multifd_common(from, to, "none"); + 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); } @@ -633,7 +637,9 @@ static void * migrate_hook_start_multifd_tls_x509_default_host(QTestState *from, QTestState *to) { - migrate_hook_start_precopy_tcp_multifd_common(from, to, "none"); + migrate_set_parameter_str(from, "multifd-compression", "none"); + migrate_set_parameter_str(to, "multifd-compression", "none"); + return migrate_hook_start_tls_x509_common(from, to, &tls_x509_default_host); } @@ -641,7 +647,9 @@ static void * migrate_hook_start_multifd_tls_x509_override_host(QTestState *from, QTestState *to) { - migrate_hook_start_precopy_tcp_multifd_common(from, to, "none"); + migrate_set_parameter_str(from, "multifd-compression", "none"); + migrate_set_parameter_str(to, "multifd-compression", "none"); + return migrate_hook_start_tls_x509_common(from, to, &tls_x509_override_host); } @@ -650,7 +658,9 @@ static void * migrate_hook_start_multifd_tls_x509_mismatch_host(QTestState *from, QTestState *to) { - migrate_hook_start_precopy_tcp_multifd_common(from, to, "none"); + migrate_set_parameter_str(from, "multifd-compression", "none"); + migrate_set_parameter_str(to, "multifd-compression", "none"); + return migrate_hook_start_tls_x509_common(from, to, &tls_x509_mismatch_host); } @@ -659,7 +669,9 @@ 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"); + migrate_set_parameter_str(from, "multifd-compression", "none"); + migrate_set_parameter_str(to, "multifd-compression", "none"); + return migrate_hook_start_tls_x509_common(from, to, &tls_x509_allow_anon_client); } @@ -668,7 +680,9 @@ 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"); + migrate_set_parameter_str(from, "multifd-compression", "none"); + migrate_set_parameter_str(to, "multifd-compression", "none"); + return migrate_hook_start_tls_x509_common(from, to, &tls_x509_reject_anon_client); } -- 2.51.0
