The combination of the start and finish hooks allow the FD passing
code to use the precopy helper
Signed-off-by: Daniel P. Berrangé
---
tests/qtest/migration-test.c | 57 +---
1 file changed, 21 insertions(+), 36 deletions(-)
diff --git a/tests/qtest/migration-test.c b/tests/qtest/migration-test.c
index ae40429798..04f749aaa1 100644
--- a/tests/qtest/migration-test.c
+++ b/tests/qtest/migration-test.c
@@ -1002,31 +1002,12 @@ static void test_precopy_tcp(void)
test_precopy_common();
}
-static void test_migrate_fd_proto(void)
+static void *test_migrate_fd_start_hook(QTestState *from,
+QTestState *to)
{
-MigrateStart args = {};
-QTestState *from, *to;
+QDict *rsp;
int ret;
int pair[2];
-QDict *rsp;
-const char *error_desc;
-
-if (test_migrate_start(, , "defer", )) {
-return;
-}
-
-/*
- * We want to pick a speed slow enough that the test completes
- * quickly, but that it doesn't complete precopy even on a slow
- * machine, so also set the downtime.
- */
-/* 1 ms should make it not converge */
-migrate_set_parameter_int(from, "downtime-limit", 1);
-/* 1GB/s */
-migrate_set_parameter_int(from, "max-bandwidth", 10);
-
-/* Wait for the first serial output from the source */
-wait_for_serial("src_serial");
/* Create two connected sockets for migration */
ret = socketpair(PF_LOCAL, SOCK_STREAM, 0, pair);
@@ -1051,17 +1032,15 @@ static void test_migrate_fd_proto(void)
qobject_unref(rsp);
close(pair[1]);
-/* Start migration to the 2nd socket*/
-migrate_qmp(from, "fd:fd-mig", "{}");
-
-wait_for_migration_pass(from);
-
-migrate_set_parameter_int(from, "downtime-limit", CONVERGE_DOWNTIME);
+return NULL;
+}
-if (!got_stop) {
-qtest_qmp_eventwait(from, "STOP");
-}
-qtest_qmp_eventwait(to, "RESUME");
+static void test_migrate_fd_finish_hook(QTestState *from,
+QTestState *to,
+void *opaque)
+{
+QDict *rsp;
+const char *error_desc;
/* Test closing fds */
/* We assume, that QEMU removes named fd from its list,
@@ -1079,11 +1058,17 @@ static void test_migrate_fd_proto(void)
error_desc = qdict_get_str(qdict_get_qdict(rsp, "error"), "desc");
g_assert_cmpstr(error_desc, ==, "File descriptor named 'fd-mig' not
found");
qobject_unref(rsp);
+}
-/* Complete migration */
-wait_for_serial("dest_serial");
-wait_for_migration_complete(from);
-test_migrate_end(from, to, true);
+static void test_migrate_fd_proto(void)
+{
+MigrateCommon args = {
+.listen_uri = "defer",
+.connect_uri = "fd:fd-mig",
+.start_hook = test_migrate_fd_start_hook,
+.finish_hook = test_migrate_fd_finish_hook
+};
+test_precopy_common();
}
static void do_test_validate_uuid(MigrateStart *args, bool should_fail)
--
2.34.1
