]> xenbits.xensource.com Git - qemu-xen.git/commitdiff
migration: Don't send data if we have stopped
authorJuan Quintela <quintela@redhat.com>
Wed, 22 Jan 2020 10:36:12 +0000 (11:36 +0100)
committerJuan Quintela <quintela@redhat.com>
Wed, 29 Jan 2020 10:28:59 +0000 (11:28 +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 <quintela@redhat.com>
Reviewed-by: Dr. David Alan Gilbert <dgilbert@redhat.com>
migration/ram.c

index f95d656c26908e356c343b473c0a9e2d5c349cb3..3fd7fdffcf77110139bc8316204ba6715b3e6dd0 100644 (file)
@@ -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);