[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PATCH 15/42] migration-test: migrate_postcopy_prepare() always return 0
From: |
Juan Quintela |
Subject: |
[PATCH 15/42] migration-test: migrate_postcopy_prepare() always return 0 |
Date: |
Fri, 9 Jun 2023 00:49:16 +0200 |
So make it return void.
Signed-off-by: Juan Quintela <quintela@redhat.com>
---
tests/qtest/migration-test.c | 16 +++++-----------
1 file changed, 5 insertions(+), 11 deletions(-)
diff --git a/tests/qtest/migration-test.c b/tests/qtest/migration-test.c
index b57811da75..e623c43957 100644
--- a/tests/qtest/migration-test.c
+++ b/tests/qtest/migration-test.c
@@ -1146,9 +1146,9 @@ test_migrate_compress_nowait_start(QTestState *from,
return NULL;
}
-static int migrate_postcopy_prepare(QTestState **from_ptr,
- QTestState **to_ptr,
- MigrateCommon *args)
+static void migrate_postcopy_prepare(QTestState **from_ptr,
+ QTestState **to_ptr,
+ MigrateCommon *args)
{
g_autofree char *uri = g_strdup_printf("unix:%s/migsocket", tmpfs);
QTestState *from, *to;
@@ -1179,8 +1179,6 @@ static int migrate_postcopy_prepare(QTestState **from_ptr,
*from_ptr = from;
*to_ptr = to;
-
- return 0;
}
static void migrate_postcopy_complete(QTestState *from, QTestState *to,
@@ -1207,9 +1205,7 @@ static void test_postcopy_common(MigrateCommon *args)
{
QTestState *from, *to;
- if (migrate_postcopy_prepare(&from, &to, args)) {
- return;
- }
+ migrate_postcopy_prepare(&from, &to, args);
migrate_postcopy_start(from, to);
migrate_postcopy_complete(from, to, args);
}
@@ -1270,9 +1266,7 @@ static void test_postcopy_recovery_common(MigrateCommon
*args)
/* Always hide errors for postcopy recover tests since they're expected */
args->start.hide_stderr = true;
- if (migrate_postcopy_prepare(&from, &to, args)) {
- return;
- }
+ migrate_postcopy_prepare(&from, &to, args);
/* Turn postcopy speed down, 4K/s is slow enough on any machines */
migrate_set_parameter_int(from, "max-postcopy-bandwidth", 4096);
--
2.40.1
- [PATCH 11/42] migration-test: Update test_ignore_shared to use args, (continued)
[PATCH 15/42] migration-test: migrate_postcopy_prepare() always return 0,
Juan Quintela <=
[PATCH 14/42] migration-test: test_migrate_start() always return 0, Juan Quintela, 2023/06/08
[PATCH 16/42] migration-test: Create do_migrate(), Juan Quintela, 2023/06/08
[PATCH 17/42] migration-test: Introduce GuestState, Juan Quintela, 2023/06/08
[PATCH 18/42] migration-test: Create guest before calling do_test_validate_uuid(), Juan Quintela, 2023/06/08
[PATCH 19/42] migration-test: Create guest before calling test_precopy_common(), Juan Quintela, 2023/06/08
[PATCH 20/42] migration-test: Create guest before calling test_postcopy_common(), Juan Quintela, 2023/06/08