[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PATCH] migration/colo.c: Add missed return in error handling
From: |
Rao Lei |
Subject: |
[PATCH] migration/colo.c: Add missed return in error handling |
Date: |
Tue, 28 Dec 2021 15:35:17 +0800 |
When doing failover and checkpoint, some returns are missed in error
handling. Let's add it.
Signed-off-by: Lei Rao <lei.rao@intel.com>
---
migration/colo.c | 7 +++++--
1 file changed, 5 insertions(+), 2 deletions(-)
diff --git a/migration/colo.c b/migration/colo.c
index 5f7071b3cd..014d3cba01 100644
--- a/migration/colo.c
+++ b/migration/colo.c
@@ -94,12 +94,15 @@ static void secondary_vm_do_failover(void)
if (local_err) {
error_report_err(local_err);
local_err = NULL;
+ return;
}
/* Notify all filters of all NIC to do checkpoint */
colo_notify_filters_event(COLO_EVENT_FAILOVER, &local_err);
if (local_err) {
error_report_err(local_err);
+ local_err = NULL;
+ return;
}
if (!autostart) {
@@ -178,6 +181,7 @@ static void primary_vm_do_failover(void)
if (local_err) {
error_report_err(local_err);
local_err = NULL;
+ return;
}
/* Notify COLO thread that failover work is finished */
@@ -507,12 +511,11 @@ static int colo_do_checkpoint_transaction(MigrationState
*s,
goto out;
}
- ret = 0;
-
qemu_mutex_lock_iothread();
vm_start();
qemu_mutex_unlock_iothread();
trace_colo_vm_state_change("stop", "run");
+ return 0;
out:
if (local_err) {
--
2.32.0
- [PATCH] migration/colo.c: Add missed return in error handling,
Rao Lei <=