|
 |
9ae3a8 |
From bf95edfa1eee98775de7daac87304ceb50be7874 Mon Sep 17 00:00:00 2001
|
|
|
9ae3a8 |
Message-Id: <bf95edfa1eee98775de7daac87304ceb50be7874.1387382496.git.minovotn@redhat.com>
|
|
|
9ae3a8 |
In-Reply-To: <c5386144fbf09f628148101bc674e2421cdd16e3.1387382496.git.minovotn@redhat.com>
|
|
|
9ae3a8 |
References: <c5386144fbf09f628148101bc674e2421cdd16e3.1387382496.git.minovotn@redhat.com>
|
|
|
9ae3a8 |
From: Nigel Croxon <ncroxon@redhat.com>
|
|
|
9ae3a8 |
Date: Thu, 14 Nov 2013 22:53:11 +0100
|
|
|
9ae3a8 |
Subject: [PATCH 35/46] arch_init: right return for ram_save_iterate
|
|
|
9ae3a8 |
|
|
|
9ae3a8 |
RH-Author: Nigel Croxon <ncroxon@redhat.com>
|
|
|
9ae3a8 |
Message-id: <1384469598-13137-36-git-send-email-ncroxon@redhat.com>
|
|
|
9ae3a8 |
Patchwork-id: 55719
|
|
|
9ae3a8 |
O-Subject: [RHEL7.0 PATCH 35/42] arch_init: right return for ram_save_iterate
|
|
|
9ae3a8 |
Bugzilla: 1011720
|
|
|
9ae3a8 |
RH-Acked-by: Orit Wasserman <owasserm@redhat.com>
|
|
|
9ae3a8 |
RH-Acked-by: Amit Shah <amit.shah@redhat.com>
|
|
|
9ae3a8 |
RH-Acked-by: Paolo Bonzini <pbonzini@redhat.com>
|
|
|
9ae3a8 |
|
|
|
9ae3a8 |
Bugzilla: 1011720
|
|
|
9ae3a8 |
https://bugzilla.redhat.com/show_bug.cgi?id=1011720
|
|
|
9ae3a8 |
|
|
|
9ae3a8 |
>From commit ID:
|
|
|
9ae3a8 |
commit 6cd0beda2c3c21fd7575e944764f392be7ef50c1
|
|
|
9ae3a8 |
Author: Lei Li <lilei@linux.vnet.ibm.com>
|
|
|
9ae3a8 |
Date: Wed Sep 4 17:02:36 2013 +0800
|
|
|
9ae3a8 |
|
|
|
9ae3a8 |
arch_init: right return for ram_save_iterate
|
|
|
9ae3a8 |
|
|
|
9ae3a8 |
qemu_file_rate_limit() never return negative value since the refactor
|
|
|
9ae3a8 |
by Commit 1964a39, this patch gets rid of the negative check for it,
|
|
|
9ae3a8 |
adjust bytes_transferred and return value correspondingly in
|
|
|
9ae3a8 |
ram_save_iterate().
|
|
|
9ae3a8 |
|
|
|
9ae3a8 |
Signed-off-by: Lei Li <lilei@linux.vnet.ibm.com>
|
|
|
9ae3a8 |
Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
|
|
|
9ae3a8 |
Signed-off-by: Juan Quintela <quintela@redhat.com>
|
|
|
9ae3a8 |
---
|
|
|
9ae3a8 |
arch_init.c | 15 ++++++++++-----
|
|
|
9ae3a8 |
1 files changed, 10 insertions(+), 5 deletions(-)
|
|
|
9ae3a8 |
|
|
|
9ae3a8 |
Signed-off-by: Michal Novotny <minovotn@redhat.com>
|
|
|
9ae3a8 |
---
|
|
|
9ae3a8 |
arch_init.c | 15 ++++++++++-----
|
|
|
9ae3a8 |
1 file changed, 10 insertions(+), 5 deletions(-)
|
|
|
9ae3a8 |
|
|
|
9ae3a8 |
diff --git a/arch_init.c b/arch_init.c
|
|
|
9ae3a8 |
index 034341c..26d0374 100644
|
|
|
9ae3a8 |
--- a/arch_init.c
|
|
|
9ae3a8 |
+++ b/arch_init.c
|
|
|
9ae3a8 |
@@ -710,15 +710,20 @@ static int ram_save_iterate(QEMUFile *f, void *opaque)
|
|
|
9ae3a8 |
*/
|
|
|
9ae3a8 |
ram_control_after_iterate(f, RAM_CONTROL_ROUND);
|
|
|
9ae3a8 |
|
|
|
9ae3a8 |
+ bytes_transferred += total_sent;
|
|
|
9ae3a8 |
+
|
|
|
9ae3a8 |
+ /*
|
|
|
9ae3a8 |
+ * Do not count these 8 bytes into total_sent, so that we can
|
|
|
9ae3a8 |
+ * return 0 if no page had been dirtied.
|
|
|
9ae3a8 |
+ */
|
|
|
9ae3a8 |
+ qemu_put_be64(f, RAM_SAVE_FLAG_EOS);
|
|
|
9ae3a8 |
+ bytes_transferred += 8;
|
|
|
9ae3a8 |
+
|
|
|
9ae3a8 |
+ ret = qemu_file_get_error(f);
|
|
|
9ae3a8 |
if (ret < 0) {
|
|
|
9ae3a8 |
- bytes_transferred += total_sent;
|
|
|
9ae3a8 |
return ret;
|
|
|
9ae3a8 |
}
|
|
|
9ae3a8 |
|
|
|
9ae3a8 |
- qemu_put_be64(f, RAM_SAVE_FLAG_EOS);
|
|
|
9ae3a8 |
- total_sent += 8;
|
|
|
9ae3a8 |
- bytes_transferred += total_sent;
|
|
|
9ae3a8 |
-
|
|
|
9ae3a8 |
return total_sent;
|
|
|
9ae3a8 |
}
|
|
|
9ae3a8 |
|
|
|
9ae3a8 |
--
|
|
|
9ae3a8 |
1.7.11.7
|
|
|
9ae3a8 |
|