75 lines
2.2 KiB
Diff
75 lines
2.2 KiB
Diff
|
From 78c7fb5afcb298631df47f6b71cf764f921c15f4 Mon Sep 17 00:00:00 2001
|
||
|
|
From: Juan Quintela <quintela@redhat.com>
|
||
|
|
Date: Tue, 3 Mar 2020 14:51:38 +0000
|
||
|
|
Subject: [PATCH 06/18] multifd: Make sure that we don't do any IO after an
|
||
|
|
error
|
||
|
|
|
||
|
|
RH-Author: Juan Quintela <quintela@redhat.com>
|
||
|
|
Message-id: <20200303145143.149290-6-quintela@redhat.com>
|
||
|
|
Patchwork-id: 94118
|
||
|
|
O-Subject: [RHEL-AV-8.2.0 qemu-kvm PATCH v2 05/10] multifd: Make sure that we don't do any IO after an error
|
||
|
|
Bugzilla: 1738451
|
||
|
|
RH-Acked-by: Laurent Vivier <lvivier@redhat.com>
|
||
|
|
RH-Acked-by: Peter Xu <peterx@redhat.com>
|
||
|
|
RH-Acked-by: Dr. David Alan Gilbert <dgilbert@redhat.com>
|
||
|
|
|
||
|
|
Signed-off-by: Juan Quintela <quintela@redhat.com>
|
||
|
|
Reviewed-by: Dr. David Alan Gilbert <dgilbert@redhat.com>
|
||
|
|
(cherry picked from commit 3d4095b222d97393b1c2c6e514951ec7798f1c43)
|
||
|
|
Signed-off-by: Danilo C. L. de Paula <ddepaula@redhat.com>
|
||
|
|
---
|
||
|
|
migration/ram.c | 22 +++++++++++++---------
|
||
|
|
1 file changed, 13 insertions(+), 9 deletions(-)
|
||
|
|
|
||
|
|
diff --git a/migration/ram.c b/migration/ram.c
|
||
|
|
index 6c55c5d..a0257ee 100644
|
||
|
|
--- a/migration/ram.c
|
||
|
|
+++ b/migration/ram.c
|
||
|
|
@@ -3440,7 +3440,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;
|
||
|
|
@@ -3511,12 +3511,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;
|
||
|
|
}
|
||
|
|
@@ -3568,9 +3570,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;
|
||
|
|
}
|
||
|
|
--
|
||
|
|
1.8.3.1
|
||
|
|
|