[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH 3/3 resend v2] arch_init: right return for ram_save_
From: |
Lei Li |
Subject: |
[Qemu-devel] [PATCH 3/3 resend v2] arch_init: right return for ram_save_iterate |
Date: |
Wed, 4 Sep 2013 17:02:36 +0800 |
qemu_file_rate_limit() never return negative value since the refactor
by Commit 1964a39, this patch gets rid of the negative check for it,
adjust bytes_transferred and return value correspondingly in
ram_save_iterate().
Signed-off-by: Lei Li <address@hidden>
Signed-off-by: Paolo Bonzini <address@hidden>
---
Change since v1:
Return fixes and improvement from Paolo Bonzini.
arch_init.c | 15 ++++++++++-----
1 files changed, 10 insertions(+), 5 deletions(-)
diff --git a/arch_init.c b/arch_init.c
index 94d45e1..a26bc89 100644
--- a/arch_init.c
+++ b/arch_init.c
@@ -709,15 +709,20 @@ static int ram_save_iterate(QEMUFile *f, void *opaque)
*/
ram_control_after_iterate(f, RAM_CONTROL_ROUND);
+ bytes_transferred += total_sent;
+
+ /*
+ * Do not count these 8 bytes into total_sent, so that we can
+ * return 0 if no page had been dirtied.
+ */
+ qemu_put_be64(f, RAM_SAVE_FLAG_EOS);
+ bytes_transferred += 8;
+
+ ret = qemu_file_get_error(f);
if (ret < 0) {
- bytes_transferred += total_sent;
return ret;
}
- qemu_put_be64(f, RAM_SAVE_FLAG_EOS);
- total_sent += 8;
- bytes_transferred += total_sent;
-
return total_sent;
}
--
1.7.7.6
- [Qemu-devel] [PATCH 0/3 resend v2] Migration fix, Lei Li, 2013/09/04
- [Qemu-devel] [PATCH 1/3 resend v2] savevm: add comments for qemu_file_get_error(), Lei Li, 2013/09/04
- [Qemu-devel] [PATCH 2/3 resend v2] savevm: fix wrong initialization by ram_control_load_hook, Lei Li, 2013/09/04
- [Qemu-devel] [PATCH 3/3 resend v2] arch_init: right return for ram_save_iterate,
Lei Li <=
- Re: [Qemu-devel] [PATCH 3/3 resend v2] arch_init: right return for ram_save_iterate, Juan Quintela, 2013/09/11
- Re: [Qemu-devel] [PATCH 3/3 resend v2] arch_init: right return for ram_save_iterate, Paolo Bonzini, 2013/09/11
- Re: [Qemu-devel] [PATCH 3/3 resend v2] arch_init: right return for ram_save_iterate, Juan Quintela, 2013/09/11
- Re: [Qemu-devel] [PATCH 3/3 resend v2] arch_init: right return for ram_save_iterate, Paolo Bonzini, 2013/09/11
- Re: [Qemu-devel] [PATCH 3/3 resend v2] arch_init: right return for ram_save_iterate, Lei Li, 2013/09/12
- Re: [Qemu-devel] [PATCH 3/3 resend v2] arch_init: right return for ram_save_iterate, Orit Wasserman, 2013/09/12
Re: [Qemu-devel] [PATCH 0/3 resend v2] Migration fix, Orit Wasserman, 2013/09/04