[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PATCH 40/42] migration-test: Create migrate_incoming() function
From: |
Juan Quintela |
Subject: |
[PATCH 40/42] migration-test: Create migrate_incoming() function |
Date: |
Fri, 9 Jun 2023 00:49:41 +0200 |
Signed-off-by: Juan Quintela <quintela@redhat.com>
---
tests/qtest/migration-test.c | 23 +++++++++++------------
1 file changed, 11 insertions(+), 12 deletions(-)
diff --git a/tests/qtest/migration-test.c b/tests/qtest/migration-test.c
index 1a03077166..d8479abb4a 100644
--- a/tests/qtest/migration-test.c
+++ b/tests/qtest/migration-test.c
@@ -684,6 +684,13 @@ static void migrate_set_capability(QTestState *who, const
char *capability,
capability, value);
}
+static void migrate_incoming(GuestState *who, const char *uri)
+{
+ qtest_qmp_assert_success(who->qs, "{ 'execute': 'migrate-incoming',"
+ " 'arguments': { 'uri': %s }}", uri);
+ guest_set_uri(who, uri);
+}
+
static void migrate_postcopy_start(GuestState *from, GuestState *to)
{
qtest_qmp_assert_success(from->qs,
@@ -1851,9 +1858,7 @@ static void *test_migrate_fd_start_hook(GuestState *from,
GuestState *to)
close(pair[0]);
/* Start incoming migration from the 1st socket */
- qtest_qmp_assert_success(to->qs, "{ 'execute': 'migrate-incoming',"
- " 'arguments': { 'uri': 'fd:fd-mig' }}");
- guest_set_uri(to, "fd:fd-mig");
+ migrate_incoming(to, "fd:fd-mig");
/* Send the 2nd socket to the target */
qtest_qmp_fds_assert_success(from->qs, &pair[1], 1,
@@ -2077,9 +2082,7 @@ test_migrate_precopy_tcp_multifd_start_common(GuestState
*from, GuestState *to,
migrate_set_capability(to->qs, "multifd", true);
/* Start incoming migration from the 1st socket */
- qtest_qmp_assert_success(to->qs, "{ 'execute': 'migrate-incoming',"
- " 'arguments': { 'uri': 'tcp:127.0.0.1:0' }}");
- guest_set_uri(to, "tcp:127.0.0.1:0");
+ migrate_incoming(to, "tcp:127.0.0.1:0");
return NULL;
}
@@ -2334,9 +2337,7 @@ static void test_multifd_tcp_cancel(void)
migrate_set_capability(to->qs, "multifd", true);
/* Start incoming migration from the 1st socket */
- qtest_qmp_assert_success(to->qs, "{ 'execute': 'migrate-incoming',"
- " 'arguments': { 'uri': 'tcp:127.0.0.1:0' }}");
- guest_set_uri(to, "tcp:127.0.0.1:0");
+ migrate_incoming(to, "tcp:127.0.0.1:0");
/* Wait for the first serial output from the source */
wait_for_serial(from);
@@ -2360,9 +2361,7 @@ static void test_multifd_tcp_cancel(void)
migrate_set_capability(to2->qs, "multifd", true);
/* Start incoming migration from the 1st socket */
- qtest_qmp_assert_success(to2->qs, "{ 'execute': 'migrate-incoming',"
- " 'arguments': { 'uri': 'tcp:127.0.0.1:0' }}");
- guest_set_uri(to2, "tcp:127.0.0.1:0");
+ migrate_incoming(to2, "tcp:127.0.0.1:0");
wait_for_migration_status(from->qs, "cancelled", NULL);
--
2.40.1
- [PATCH 30/42] migration-test: Hooks also need GuestState, (continued)
- [PATCH 30/42] migration-test: Hooks also need GuestState, Juan Quintela, 2023/06/08
- [PATCH 32/42] migration-test: Create guest_set_uri(), Juan Quintela, 2023/06/08
- [PATCH 33/42] migration-test: Remove connect_uri, Juan Quintela, 2023/06/08
- [PATCH 31/42] migration-test: Preffer to->uri to uri parameter for migration, Juan Quintela, 2023/06/08
- [PATCH 36/42] migration-test: Remove unused listen_uri, Juan Quintela, 2023/06/08
- [PATCH 34/42] migration-test: Use new schema for all tests that use unix sockets, Juan Quintela, 2023/06/08
- [PATCH 35/42] migration-test: Set uri for tcp tests with guest_set_uri(), Juan Quintela, 2023/06/08
- [PATCH 37/42] migration-test: Create get_event GuestState variable, Juan Quintela, 2023/06/08
- [PATCH 38/42] migration-test: Create guest_realize(), Juan Quintela, 2023/06/08
- [PATCH 39/42] migration-test: Unfold test_migrate_end() into three functions, Juan Quintela, 2023/06/08
- [PATCH 40/42] migration-test: Create migrate_incoming() function,
Juan Quintela <=
- [PATCH 41/42] migration-test: Move functions to migration-helpers.c, Juan Quintela, 2023/06/08
- [PATCH 42/42] migration-test: Split vcpu-dirty-limit-test, Juan Quintela, 2023/06/08