diff options
| author | Juan Quintela <quintela@redhat.com> | 2019-12-18 05:12:36 +0100 |
|---|---|---|
| committer | Juan Quintela <quintela@redhat.com> | 2020-01-29 11:28:59 +0100 |
| commit | 3d4095b222d97393b1c2c6e514951ec7798f1c43 (patch) | |
| tree | ad39757e40c744257c4608e2af5ade8eaaabd71e /migration | |
| parent | 334d15d504633a4610b8f4de4e01d8bba24c2655 (diff) | |
multifd: Make sure that we don't do any IO after an error
Signed-off-by: Juan Quintela <quintela@redhat.com>
Reviewed-by: Dr. David Alan Gilbert <dgilbert@redhat.com>
Diffstat (limited to 'migration')
| -rw-r--r-- | migration/ram.c | 22 |
1 files 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; } |