From 5910d1e6cbb190809d5dd0d75bb5e8398dd3ffb7 Mon Sep 17 00:00:00 2001 From: Juan Quintela Date: Thu, 28 Jun 2012 19:41:52 +0200 Subject: [PATCH] ram: save_live_setup() don't need to sent pages We should send pages on interate phase, not in setup one. This was a "bug". Just removing the loop does what we want. Tested that it works with current ram_load(). Signed-off-by: Juan Quintela --- arch_init.c | 34 ---------------------------------- 1 file changed, 34 deletions(-) diff --git a/arch_init.c b/arch_init.c index 7e04ea5e7..2a6fc77a8 100644 --- a/arch_init.c +++ b/arch_init.c @@ -307,9 +307,6 @@ static int ram_save_setup(QEMUFile *f, void *opaque) { ram_addr_t addr; RAMBlock *block; - double bwidth = 0; - int ret; - int i; memory_global_sync_dirty_bitmap(get_system_memory()); @@ -338,37 +335,6 @@ static int ram_save_setup(QEMUFile *f, void *opaque) qemu_put_be64(f, block->length); } - bwidth = qemu_get_clock_ns(rt_clock); - - i = 0; - while ((ret = qemu_file_rate_limit(f)) == 0) { - int bytes_sent; - - bytes_sent = ram_save_block(f); - bytes_transferred += bytes_sent; - if (bytes_sent == 0) { /* no more blocks */ - break; - } - /* 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 - iterations - */ - if ((i & 63) == 0) { - uint64_t t1 = (qemu_get_clock_ns(rt_clock) - bwidth) / 1000000; - if (t1 > MAX_WAIT) { - DPRINTF("big wait: " PRIu64 " milliseconds, %d iterations\n", - t1, i); - break; - } - } - i++; - } - - if (ret < 0) { - return ret; - } - qemu_put_be64(f, RAM_SAVE_FLAG_EOS); return 0; -- 2.39.2