[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH 3/9] arch_init: right return for ram_save_iterate
From: |
Juan Quintela |
Subject: |
[Qemu-devel] [PATCH 3/9] arch_init: right return for ram_save_iterate |
Date: |
Tue, 24 Sep 2013 14:03:17 +0200 |
From: Lei Li <address@hidden>
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>
Signed-off-by: Juan Quintela <address@hidden>
---
arch_init.c | 15 ++++++++++-----
1 file changed, 10 insertions(+), 5 deletions(-)
diff --git a/arch_init.c b/arch_init.c
index e47e139..18cd9a1 100644
--- a/arch_init.c
+++ b/arch_init.c
@@ -710,15 +710,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.8.3.1
- [Qemu-devel] [PULL 0/9] migration queue, Juan Quintela, 2013/09/24
- [Qemu-devel] [PATCH 1/9] savevm: add comments for qemu_file_get_error(), Juan Quintela, 2013/09/24
- [Qemu-devel] [PATCH 2/9] savevm: fix wrong initialization by ram_control_load_hook, Juan Quintela, 2013/09/24
- [Qemu-devel] [PATCH 4/9] rdma: clean up of qemu_rdma_cleanup(), Juan Quintela, 2013/09/24
- [Qemu-devel] [PATCH 5/9] rdma: constify ram_chunk_{index, start, end}, Juan Quintela, 2013/09/24
- [Qemu-devel] [PATCH 6/9] migration: add version supporting macros for struct pointer, Juan Quintela, 2013/09/24
- [Qemu-devel] [PATCH 7/9] migration: Fix debug print type, Juan Quintela, 2013/09/24
- [Qemu-devel] [PATCH 9/9] migration: ram_handle_compressed, Juan Quintela, 2013/09/24
- [Qemu-devel] [PATCH 8/9] arch_init: make is_zero_page accept size, Juan Quintela, 2013/09/24
- [Qemu-devel] [PATCH 3/9] arch_init: right return for ram_save_iterate,
Juan Quintela <=