[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PATCH v4 2/6] multifd: Make sure that we don't do any IO after an error
From: |
Juan Quintela |
Subject: |
[PATCH v4 2/6] multifd: Make sure that we don't do any IO after an error |
Date: |
Wed, 22 Jan 2020 12:15:13 +0100 |
Signed-off-by: Juan Quintela <address@hidden>
Reviewed-by: Dr. David Alan Gilbert <address@hidden>
Signed-off-by: Juan Quintela <address@hidden>
---
migration/ram.c | 22 +++++++++++++---------
1 file changed, 13 insertions(+), 9 deletions(-)
diff --git a/migration/ram.c b/migration/ram.c
index d2208b5534..f95d656c26 100644
--- a/migration/ram.c
+++ b/migration/ram.c
@@ -3445,7 +3445,7 @@ static int ram_save_iterate(QEMUFile *f, void *opaque)
{
RAMState **temp = opaque;
RAMState *rs = *temp;
- int ret;
+ int ret = 0;
int i;
int64_t t0;
int done = 0;
@@ -3524,12 +3524,14 @@ static int ram_save_iterate(QEMUFile *f, void *opaque)
ram_control_after_iterate(f, RAM_CONTROL_ROUND);
out:
- multifd_send_sync_main(rs);
- qemu_put_be64(f, RAM_SAVE_FLAG_EOS);
- qemu_fflush(f);
- ram_counters.transferred += 8;
+ if (ret >= 0) {
+ multifd_send_sync_main(rs);
+ qemu_put_be64(f, RAM_SAVE_FLAG_EOS);
+ qemu_fflush(f);
+ ram_counters.transferred += 8;
- ret = qemu_file_get_error(f);
+ ret = qemu_file_get_error(f);
+ }
if (ret < 0) {
return ret;
}
@@ -3581,9 +3583,11 @@ static int ram_save_complete(QEMUFile *f, void *opaque)
ram_control_after_iterate(f, RAM_CONTROL_FINISH);
}
- multifd_send_sync_main(rs);
- qemu_put_be64(f, RAM_SAVE_FLAG_EOS);
- qemu_fflush(f);
+ if (ret >= 0) {
+ multifd_send_sync_main(rs);
+ qemu_put_be64(f, RAM_SAVE_FLAG_EOS);
+ qemu_fflush(f);
+ }
return ret;
}
--
2.24.1
- [PATCH v4 0/6] Fix multifd + cancel + multifd, Juan Quintela, 2020/01/22
- [PATCH v4 2/6] multifd: Make sure that we don't do any IO after an error,
Juan Quintela <=
- [PATCH v4 1/6] migration-test: Use g_free() instead of free(), Juan Quintela, 2020/01/22
- [PATCH v4 3/6] qemu-file: Don't do IO after shutdown, Juan Quintela, 2020/01/22
- [PATCH v4 4/6] migration-test: Make sure that multifd and cancel works, Juan Quintela, 2020/01/22
- [PATCH v4 5/6] migration: Create migration_is_running(), Juan Quintela, 2020/01/22
- [PATCH v4 6/6] migration: Don't send data if we have stopped, Juan Quintela, 2020/01/22