cryptospore / rpms / qemu-kvm

Forked from rpms/qemu-kvm 2 years ago
Clone
902636
From ab07e0b41c50a85940d798a9a65a58698fd2edfb Mon Sep 17 00:00:00 2001
902636
From: Juan Quintela <quintela@redhat.com>
902636
Date: Tue, 3 Mar 2020 14:51:40 +0000
902636
Subject: [PATCH 08/18] migration: Don't send data if we have stopped
902636
902636
RH-Author: Juan Quintela <quintela@redhat.com>
902636
Message-id: <20200303145143.149290-8-quintela@redhat.com>
902636
Patchwork-id: 94114
902636
O-Subject: [RHEL-AV-8.2.0 qemu-kvm PATCH v2 07/10] migration: Don't send data if we have stopped
902636
Bugzilla: 1738451
902636
RH-Acked-by: Laurent Vivier <lvivier@redhat.com>
902636
RH-Acked-by: Peter Xu <peterx@redhat.com>
902636
RH-Acked-by: Dr. David Alan Gilbert <dgilbert@redhat.com>
902636
902636
If we do a cancel, we got out without one error, but we can't do the
902636
rest of the output as in a normal situation.
902636
902636
Signed-off-by: Juan Quintela <quintela@redhat.com>
902636
Reviewed-by: Dr. David Alan Gilbert <dgilbert@redhat.com>
902636
(cherry picked from commit b69a0227a803256ad270283872d40ff768f4d56d)
902636
Signed-off-by: Danilo C. L. de Paula <ddepaula@redhat.com>
902636
---
902636
 migration/ram.c | 3 ++-
902636
 1 file changed, 2 insertions(+), 1 deletion(-)
902636
902636
diff --git a/migration/ram.c b/migration/ram.c
902636
index a0257ee..902c56c 100644
902636
--- a/migration/ram.c
902636
+++ b/migration/ram.c
902636
@@ -3511,7 +3511,8 @@ static int ram_save_iterate(QEMUFile *f, void *opaque)
902636
     ram_control_after_iterate(f, RAM_CONTROL_ROUND);
902636
 
902636
 out:
902636
-    if (ret >= 0) {
902636
+    if (ret >= 0
902636
+        && migration_is_setup_or_active(migrate_get_current()->state)) {
902636
         multifd_send_sync_main(rs);
902636
         qemu_put_be64(f, RAM_SAVE_FLAG_EOS);
902636
         qemu_fflush(f);
902636
-- 
902636
1.8.3.1
902636