|
 |
22c213 |
From 78c7fb5afcb298631df47f6b71cf764f921c15f4 Mon Sep 17 00:00:00 2001
|
|
|
22c213 |
From: Juan Quintela <quintela@redhat.com>
|
|
|
22c213 |
Date: Tue, 3 Mar 2020 14:51:38 +0000
|
|
|
22c213 |
Subject: [PATCH 06/18] multifd: Make sure that we don't do any IO after an
|
|
|
22c213 |
error
|
|
|
22c213 |
|
|
|
22c213 |
RH-Author: Juan Quintela <quintela@redhat.com>
|
|
|
22c213 |
Message-id: <20200303145143.149290-6-quintela@redhat.com>
|
|
|
22c213 |
Patchwork-id: 94118
|
|
|
22c213 |
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
|
|
|
22c213 |
Bugzilla: 1738451
|
|
|
22c213 |
RH-Acked-by: Laurent Vivier <lvivier@redhat.com>
|
|
|
22c213 |
RH-Acked-by: Peter Xu <peterx@redhat.com>
|
|
|
22c213 |
RH-Acked-by: Dr. David Alan Gilbert <dgilbert@redhat.com>
|
|
|
22c213 |
|
|
|
22c213 |
Signed-off-by: Juan Quintela <quintela@redhat.com>
|
|
|
22c213 |
Reviewed-by: Dr. David Alan Gilbert <dgilbert@redhat.com>
|
|
|
22c213 |
(cherry picked from commit 3d4095b222d97393b1c2c6e514951ec7798f1c43)
|
|
|
22c213 |
Signed-off-by: Danilo C. L. de Paula <ddepaula@redhat.com>
|
|
|
22c213 |
---
|
|
|
22c213 |
migration/ram.c | 22 +++++++++++++---------
|
|
|
22c213 |
1 file changed, 13 insertions(+), 9 deletions(-)
|
|
|
22c213 |
|
|
|
22c213 |
diff --git a/migration/ram.c b/migration/ram.c
|
|
|
22c213 |
index 6c55c5d..a0257ee 100644
|
|
|
22c213 |
--- a/migration/ram.c
|
|
|
22c213 |
+++ b/migration/ram.c
|
|
|
22c213 |
@@ -3440,7 +3440,7 @@ static int ram_save_iterate(QEMUFile *f, void *opaque)
|
|
|
22c213 |
{
|
|
|
22c213 |
RAMState **temp = opaque;
|
|
|
22c213 |
RAMState *rs = *temp;
|
|
|
22c213 |
- int ret;
|
|
|
22c213 |
+ int ret = 0;
|
|
|
22c213 |
int i;
|
|
|
22c213 |
int64_t t0;
|
|
|
22c213 |
int done = 0;
|
|
|
22c213 |
@@ -3511,12 +3511,14 @@ static int ram_save_iterate(QEMUFile *f, void *opaque)
|
|
|
22c213 |
ram_control_after_iterate(f, RAM_CONTROL_ROUND);
|
|
|
22c213 |
|
|
|
22c213 |
out:
|
|
|
22c213 |
- multifd_send_sync_main(rs);
|
|
|
22c213 |
- qemu_put_be64(f, RAM_SAVE_FLAG_EOS);
|
|
|
22c213 |
- qemu_fflush(f);
|
|
|
22c213 |
- ram_counters.transferred += 8;
|
|
|
22c213 |
+ if (ret >= 0) {
|
|
|
22c213 |
+ multifd_send_sync_main(rs);
|
|
|
22c213 |
+ qemu_put_be64(f, RAM_SAVE_FLAG_EOS);
|
|
|
22c213 |
+ qemu_fflush(f);
|
|
|
22c213 |
+ ram_counters.transferred += 8;
|
|
|
22c213 |
|
|
|
22c213 |
- ret = qemu_file_get_error(f);
|
|
|
22c213 |
+ ret = qemu_file_get_error(f);
|
|
|
22c213 |
+ }
|
|
|
22c213 |
if (ret < 0) {
|
|
|
22c213 |
return ret;
|
|
|
22c213 |
}
|
|
|
22c213 |
@@ -3568,9 +3570,11 @@ static int ram_save_complete(QEMUFile *f, void *opaque)
|
|
|
22c213 |
ram_control_after_iterate(f, RAM_CONTROL_FINISH);
|
|
|
22c213 |
}
|
|
|
22c213 |
|
|
|
22c213 |
- multifd_send_sync_main(rs);
|
|
|
22c213 |
- qemu_put_be64(f, RAM_SAVE_FLAG_EOS);
|
|
|
22c213 |
- qemu_fflush(f);
|
|
|
22c213 |
+ if (ret >= 0) {
|
|
|
22c213 |
+ multifd_send_sync_main(rs);
|
|
|
22c213 |
+ qemu_put_be64(f, RAM_SAVE_FLAG_EOS);
|
|
|
22c213 |
+ qemu_fflush(f);
|
|
|
22c213 |
+ }
|
|
|
22c213 |
|
|
|
22c213 |
return ret;
|
|
|
22c213 |
}
|
|
|
22c213 |
--
|
|
|
22c213 |
1.8.3.1
|
|
|
22c213 |
|