[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PATCH v4 06/10] migration: process_incoming_migration_co: simplify code
From: |
Vladimir Sementsov-Ogievskiy |
Subject: |
[PATCH v4 06/10] migration: process_incoming_migration_co: simplify code flow around ret |
Date: |
Fri, 28 Apr 2023 22:49:24 +0300 |
Signed-off-by: Vladimir Sementsov-Ogievskiy <vsementsov@yandex-team.ru>
---
migration/migration.c | 11 ++++++-----
1 file changed, 6 insertions(+), 5 deletions(-)
diff --git a/migration/migration.c b/migration/migration.c
index d4fa1a853c..8db0892317 100644
--- a/migration/migration.c
+++ b/migration/migration.c
@@ -533,8 +533,13 @@ process_incoming_migration_co(void *opaque)
/* Else if something went wrong then just fall out of the normal exit
*/
}
+ if (ret < 0) {
+ error_report("load of migration failed: %s", strerror(-ret));
+ goto fail;
+ }
+
/* we get COLO info, and know if we are in COLO mode */
- if (!ret && migration_incoming_colo_enabled()) {
+ if (migration_incoming_colo_enabled()) {
QemuThread colo_incoming_thread;
/* Make sure all file formats throw away their mutable metadata */
@@ -556,10 +561,6 @@ process_incoming_migration_co(void *opaque)
colo_release_ram_cache();
}
- if (ret < 0) {
- error_report("load of migration failed: %s", strerror(-ret));
- goto fail;
- }
mis->bh = qemu_bh_new(process_incoming_migration_bh, mis);
qemu_bh_schedule(mis->bh);
mis->migration_incoming_co = NULL;
--
2.34.1
- [PATCH v4 00/10] COLO: improve build options, Vladimir Sementsov-Ogievskiy, 2023/04/28
- [PATCH v4 02/10] colo: make colo_checkpoint_notify static and provide simpler API, Vladimir Sementsov-Ogievskiy, 2023/04/28
- [PATCH v4 05/10] migration: drop colo_incoming_thread from MigrationIncomingState, Vladimir Sementsov-Ogievskiy, 2023/04/28
- [PATCH v4 03/10] build: move COLO under CONFIG_REPLICATION, Vladimir Sementsov-Ogievskiy, 2023/04/28
- [PATCH v4 07/10] migration: split migration_incoming_co, Vladimir Sementsov-Ogievskiy, 2023/04/28
- [PATCH v4 04/10] configure: add --disable-colo-proxy option, Vladimir Sementsov-Ogievskiy, 2023/04/28
- [PATCH v4 08/10] migration: process_incoming_migration_co(): move colo part to colo, Vladimir Sementsov-Ogievskiy, 2023/04/28
- [PATCH v4 09/10] migration: disallow change capabilities in COLO state, Vladimir Sementsov-Ogievskiy, 2023/04/28
- [PATCH v4 10/10] migration: block incoming colo when capability is disabled, Vladimir Sementsov-Ogievskiy, 2023/04/28
- [PATCH v4 06/10] migration: process_incoming_migration_co: simplify code flow around ret,
Vladimir Sementsov-Ogievskiy <=
- [PATCH v4 01/10] block/meson.build: prefer positive condition for replication, Vladimir Sementsov-Ogievskiy, 2023/04/28