OpenE2K
/
qemu-e2k
13
4
Fork 0
Code Issues 4 Pull Requests Projects 2 Releases Activity

tests: switch migration FD passing test to use common precopy helper 

The combination of the start and finish hooks allow the FD passing
code to use the precopy helper

Signed-off-by: Daniel P. Berrangé <berrange@redhat.com>
Message-Id: <20220310171821.3724080-11-berrange@redhat.com>
Reviewed-by: Peter Xu <peterx@redhat.com>
Signed-off-by: Dr. David Alan Gilbert <dgilbert@redhat.com>
This commit is contained in:
Daniel P. Berrangé 2022-03-10 17:18:13 +00:00 committed by Dr. David Alan Gilbert
parent b3caa7b55e
commit 243e006686
1 changed files with 21 additions and 36 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

57
tests/qtest/migration-test.c
View File

@ -1002,31 +1002,12 @@ static void test_precopy_tcp(void)
test_precopy_common(&args); test_precopy_common(&args);
} }
static void test_migrate_fd_proto(void) static void *test_migrate_fd_start_hook(QTestState *from,
QTestState *to)
{ {
MigrateStart args = {}; QDict *rsp;
QTestState *from, *to;
int ret; int ret;
int pair[2]; int pair[2];
QDict *rsp;
const char *error_desc;
if (test_migrate_start(&from, &to, "defer", &args)) {
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", 1000000000);
/* Wait for the first serial output from the source */
wait_for_serial("src_serial");
/* Create two connected sockets for migration */ /* Create two connected sockets for migration */
ret = socketpair(PF_LOCAL, SOCK_STREAM, 0, pair); ret = socketpair(PF_LOCAL, SOCK_STREAM, 0, pair);
@ -1051,17 +1032,15 @@ static void test_migrate_fd_proto(void)
qobject_unref(rsp); qobject_unref(rsp);
close(pair[1]); close(pair[1]);
/* Start migration to the 2nd socket*/ return NULL;
migrate_qmp(from, "fd:fd-mig", "{}"); }
wait_for_migration_pass(from); static void test_migrate_fd_finish_hook(QTestState *from,
QTestState *to,
migrate_set_parameter_int(from, "downtime-limit", CONVERGE_DOWNTIME); void *opaque)
{
if (!got_stop) { QDict *rsp;
qtest_qmp_eventwait(from, "STOP"); const char *error_desc;
}
qtest_qmp_eventwait(to, "RESUME");
/* Test closing fds */ /* Test closing fds */
/* We assume, that QEMU removes named fd from its list, /* 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"); error_desc = qdict_get_str(qdict_get_qdict(rsp, "error"), "desc");
g_assert_cmpstr(error_desc, ==, "File descriptor named 'fd-mig' not found"); g_assert_cmpstr(error_desc, ==, "File descriptor named 'fd-mig' not found");
qobject_unref(rsp); qobject_unref(rsp);
}
/* Complete migration */ static void test_migrate_fd_proto(void)
wait_for_serial("dest_serial"); {
wait_for_migration_complete(from); MigrateCommon args = {
test_migrate_end(from, to, true); .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(&args);
} }
static void do_test_validate_uuid(MigrateStart *args, bool should_fail) static void do_test_validate_uuid(MigrateStart *args, bool should_fail)