diff options
| author | Juan Quintela <quintela@redhat.com> | 2012-08-06 21:42:58 +0300 |
|---|---|---|
| committer | Juan Quintela <quintela@redhat.com> | 2012-08-08 13:51:12 +0200 |
| commit | dd051c7217eae04191169ac62f6ffb7531c8da32 (patch) | |
| tree | 990255c6fe5a99647c3697246fa3519b6c0b4c4f /arch_init.c | |
| parent | f36d55af7408abceeee2543f697647ff86bd8a24 (diff) | |
| download | qemu-dd051c7217eae04191169ac62f6ffb7531c8da32.zip qemu-dd051c7217eae04191169ac62f6ffb7531c8da32.tar.gz qemu-dd051c7217eae04191169ac62f6ffb7531c8da32.tar.bz2 | |
Restart optimization on stage3 update version
Signed-off-by: Juan Quintela <quintela@redhat.com>
Reviewed-by: Luiz Capitulino <lcapitulino@redhat.com>
Reviewed-by: Eric Blake <eblake@redhat.com>
Diffstat (limited to 'arch_init.c')
| -rw-r--r-- | arch_init.c | 24 |
1 files changed, 15 insertions, 9 deletions
diff --git a/arch_init.c b/arch_init.c index ee692ae..a7c0987 100644 --- a/arch_init.c +++ b/arch_init.c @@ -275,14 +275,16 @@ static void save_block_hdr(QEMUFile *f, RAMBlock *block, ram_addr_t offset, static int save_xbzrle_page(QEMUFile *f, uint8_t *current_data, ram_addr_t current_addr, RAMBlock *block, - ram_addr_t offset, int cont) + ram_addr_t offset, int cont, bool last_stage) { int encoded_len = 0, bytes_sent = -1; uint8_t *prev_cached_page; if (!cache_is_cached(XBZRLE.cache, current_addr)) { - cache_insert(XBZRLE.cache, current_addr, - g_memdup(current_data, TARGET_PAGE_SIZE)); + if (!last_stage) { + cache_insert(XBZRLE.cache, current_addr, + g_memdup(current_data, TARGET_PAGE_SIZE)); + } acct_info.xbzrle_cache_miss++; return -1; } @@ -308,7 +310,9 @@ static int save_xbzrle_page(QEMUFile *f, uint8_t *current_data, } /* we need to update the data in the cache, in order to get the same data */ - memcpy(prev_cached_page, XBZRLE.current_buf, TARGET_PAGE_SIZE); + if (!last_stage) { + memcpy(prev_cached_page, XBZRLE.current_buf, TARGET_PAGE_SIZE); + } /* Send XBZRLE based compressed page */ save_block_hdr(f, block, offset, cont, RAM_SAVE_FLAG_XBZRLE); @@ -333,7 +337,7 @@ static ram_addr_t last_offset; * n: the amount of bytes written in other case */ -static int ram_save_block(QEMUFile *f) +static int ram_save_block(QEMUFile *f, bool last_stage) { RAMBlock *block = last_block; ram_addr_t offset = last_offset; @@ -364,8 +368,10 @@ static int ram_save_block(QEMUFile *f) } else if (migrate_use_xbzrle()) { current_addr = block->offset + offset; bytes_sent = save_xbzrle_page(f, p, current_addr, block, - offset, cont); - p = get_cached_data(XBZRLE.cache, current_addr); + offset, cont, last_stage); + if (!last_stage) { + p = get_cached_data(XBZRLE.cache, current_addr); + } } /* either we didn't send yet (we may have had XBZRLE overflow) */ @@ -538,7 +544,7 @@ static int ram_save_iterate(QEMUFile *f, void *opaque) while ((ret = qemu_file_rate_limit(f)) == 0) { int bytes_sent; - bytes_sent = ram_save_block(f); + bytes_sent = ram_save_block(f, false); /* no more blocks to sent */ if (bytes_sent < 0) { break; @@ -600,7 +606,7 @@ static int ram_save_complete(QEMUFile *f, void *opaque) while (true) { int bytes_sent; - bytes_sent = ram_save_block(f); + bytes_sent = ram_save_block(f, true); /* no more blocks to sent */ if (bytes_sent < 0) { break; |