From patchwork Thu Aug 19 13:18:42 2010 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: [4/4] savevm: Reset last block info at beginning of each save From: Luiz Capitulino X-Patchwork-Id: 62156 Message-Id: <1282223922-5971-5-git-send-email-lcapitulino@redhat.com> To: aliguori@us.ibm.com Cc: Alex Williamson , qemu-devel@nongnu.org Date: Thu, 19 Aug 2010 10:18:42 -0300 From: Alex Williamson If we save more than once we need to reset the last block info or else only the first save has the actual block info and each subsequent save will only use continue flags, making them unloadable independently. Found-by: Miguel Di Ciurcio Filho Signed-off-by: Alex Williamson Acked-by: Glauber Costa Signed-off-by: Luiz Capitulino --- arch_init.c | 7 +++++-- 1 files changed, 5 insertions(+), 2 deletions(-) diff --git a/arch_init.c b/arch_init.c index 47bb4b2..e0bd18c 100644 --- a/arch_init.c +++ b/arch_init.c @@ -104,10 +104,11 @@ static int is_dup_page(uint8_t *page, uint8_t ch) return 1; } +static RAMBlock *last_block; +static ram_addr_t last_offset; + static int ram_save_block(QEMUFile *f) { - static RAMBlock *last_block = NULL; - static ram_addr_t last_offset = 0; RAMBlock *block = last_block; ram_addr_t offset = last_offset; ram_addr_t current_addr; @@ -231,6 +232,8 @@ int ram_save_live(Monitor *mon, QEMUFile *f, int stage, void *opaque) if (stage == 1) { RAMBlock *block; bytes_transferred = 0; + last_block = NULL; + last_offset = 0; /* Make sure all dirty bits are set */ QLIST_FOREACH(block, &ram_list.blocks, next) {