[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PULL 04/19] migration: Don't send data if we have stopped
From: |
Juan Quintela |
Subject: |
[PULL 04/19] migration: Don't send data if we have stopped |
Date: |
Mon, 27 Jan 2020 23:33:06 +0100 |
If we do a cancel, we got out without one error, but we can't do the
rest of the output as in a normal situation.
Signed-off-by: Juan Quintela <address@hidden>
Reviewed-by: Dr. David Alan Gilbert <address@hidden>
---
migration/ram.c | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
diff --git a/migration/ram.c b/migration/ram.c
index f95d656c26..3fd7fdffcf 100644
--- a/migration/ram.c
+++ b/migration/ram.c
@@ -3524,7 +3524,8 @@ static int ram_save_iterate(QEMUFile *f, void *opaque)
ram_control_after_iterate(f, RAM_CONTROL_ROUND);
out:
- if (ret >= 0) {
+ if (ret >= 0
+ && migration_is_setup_or_active(migrate_get_current()->state)) {
multifd_send_sync_main(rs);
qemu_put_be64(f, RAM_SAVE_FLAG_EOS);
qemu_fflush(f);
--
2.24.1
- [PULL 00/19] 10 next patches, Juan Quintela, 2020/01/27
- [PULL 01/19] migration-test: Use g_free() instead of free(), Juan Quintela, 2020/01/27
- [PULL 03/19] qemu-file: Don't do IO after shutdown, Juan Quintela, 2020/01/27
- [PULL 02/19] multifd: Make sure that we don't do any IO after an error, Juan Quintela, 2020/01/27
- [PULL 04/19] migration: Don't send data if we have stopped,
Juan Quintela <=
- [PULL 05/19] migration-test: Make sure that multifd and cancel works, Juan Quintela, 2020/01/27
- [PULL 06/19] migration: Create migration_is_running(), Juan Quintela, 2020/01/27
- [PULL 08/19] ram_addr: Split RAMBlock definition, Juan Quintela, 2020/01/27
- [PULL 07/19] migration/multifd: fix nullptr access in multifd_send_terminate_threads, Juan Quintela, 2020/01/27
- [PULL 09/19] multifd: multifd_send_pages only needs the qemufile, Juan Quintela, 2020/01/27
- [PULL 10/19] multifd: multifd_queue_page only needs the qemufile, Juan Quintela, 2020/01/27
- [PULL 11/19] multifd: multifd_send_sync_main only needs the qemufile, Juan Quintela, 2020/01/27
- [PULL 12/19] multifd: Use qemu_target_page_size(), Juan Quintela, 2020/01/27
- [PULL 13/19] migration: Make checkpatch happy with comments, Juan Quintela, 2020/01/27
- [PULL 14/19] multifd: Make multifd_save_setup() get an Error parameter, Juan Quintela, 2020/01/27