[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH 17/22] Change ram_save_block to return -1 if there a
From: |
Juan Quintela |
Subject: |
[Qemu-devel] [PATCH 17/22] Change ram_save_block to return -1 if there are no more changes |
Date: |
Fri, 13 Jul 2012 09:23:39 +0200 |
From: Orit Wasserman <address@hidden>
It will return 0 if the page is unmodifed.
Signed-off-by: Orit Wasserman <address@hidden>
Signed-off-by: Juan Quintela <address@hidden>
---
arch_init.c | 26 ++++++++++++++++++++------
1 file changed, 20 insertions(+), 6 deletions(-)
diff --git a/arch_init.c b/arch_init.c
index 8cbf8f4..78cdf50 100644
--- a/arch_init.c
+++ b/arch_init.c
@@ -184,11 +184,19 @@ static void save_block_hdr(QEMUFile *f, RAMBlock *block,
ram_addr_t offset,
static RAMBlock *last_block;
static ram_addr_t last_offset;
+/*
+ * ram_save_block: Writes a page of memory to the stream f
+ *
+ * Returns: 0: if the page hasn't changed
+ * -1: if there are no more dirty pages
+ * n: the amount of bytes written in other case
+ */
+
static int ram_save_block(QEMUFile *f)
{
RAMBlock *block = last_block;
ram_addr_t offset = last_offset;
- int bytes_sent = 0;
+ int bytes_sent = -1;
MemoryRegion *mr;
if (!block)
@@ -354,10 +362,11 @@ static int ram_save_iterate(QEMUFile *f, void *opaque)
int bytes_sent;
bytes_sent = ram_save_block(f);
- bytes_transferred += bytes_sent;
- if (bytes_sent == 0) { /* no more blocks */
+ /* no more blocks to sent */
+ if (bytes_sent < 0) {
break;
}
+ bytes_transferred += bytes_sent;
/* we want to check in the 1st loop, just in case it was the 1st time
and we had to sync the dirty bitmap.
qemu_get_clock_ns() is a bit expensive, so we only check each some
@@ -405,14 +414,19 @@ static int ram_save_iterate(QEMUFile *f, void *opaque)
static int ram_save_complete(QEMUFile *f, void *opaque)
{
- int bytes_sent;
-
memory_global_sync_dirty_bitmap(get_system_memory());
/* try transferring iterative blocks of memory */
/* flush all remaining blocks regardless of rate limiting */
- while ((bytes_sent = ram_save_block(f)) != 0) {
+ while (true) {
+ int bytes_sent;
+
+ bytes_sent = ram_save_block(f);
+ /* no more blocks to sent */
+ if (bytes_sent < 0) {
+ break;
+ }
bytes_transferred += bytes_sent;
}
memory_global_dirty_log_stop();
--
1.7.10.4
- [Qemu-devel] [PATCH 08/22] savevm: split save_live into stage2 and stage3, (continued)
- [Qemu-devel] [PATCH 08/22] savevm: split save_live into stage2 and stage3, Juan Quintela, 2012/07/13
- [Qemu-devel] [PATCH 01/22] savevm: Use a struct to pass all handlers, Juan Quintela, 2012/07/13
- [Qemu-devel] [PATCH 12/22] ram: save_live_setup() we don't need to synchronize the dirty bitmap., Juan Quintela, 2012/07/13
- [Qemu-devel] [PATCH 11/22] ram: iterate phase, Juan Quintela, 2012/07/13
- [Qemu-devel] [PATCH 13/22] Add migration capabilities, Juan Quintela, 2012/07/13
- [Qemu-devel] [PATCH 10/22] ram: save_live_complete() only do one loop, Juan Quintela, 2012/07/13
- [Qemu-devel] [PATCH 14/22] Add XBZRLE documentation, Juan Quintela, 2012/07/13
- [Qemu-devel] [PATCH 17/22] Change ram_save_block to return -1 if there are no more changes,
Juan Quintela <=
- [Qemu-devel] [PATCH 18/22] Add xbzrle_encode_buffer and xbzrle_decode_buffer functions, Juan Quintela, 2012/07/13
- [Qemu-devel] [PATCH 19/22] Add XBZRLE to ram_save_block and ram_save_live, Juan Quintela, 2012/07/13
- [Qemu-devel] [PATCH 16/22] Add uleb encoding/decoding functions, Juan Quintela, 2012/07/13
- [Qemu-devel] [PATCH 15/22] Add cache handling functions, Juan Quintela, 2012/07/13
- [Qemu-devel] [PATCH 21/22] Add XBZRLE statistics, Juan Quintela, 2012/07/13
- [Qemu-devel] [PATCH 20/22] Add migrate_set_cachesize command, Juan Quintela, 2012/07/13
- [Qemu-devel] [PATCH 22/22] ram: save live optimization, Juan Quintela, 2012/07/13