david.venhoff/QEMU-Nyx-fork
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

ram: Remember last_page instead of last_offset

Browse Source 
Signed-off-by: Juan Quintela <quintela@redhat.com>
Reviewed-by: Dr. David Alan Gilbert <dgilbert@redhat.com>
Reviewed-by: Philippe Mathieu-Daudé <f4bug@amsat.org>

--

Improve comment
Fix typo
This commit is contained in:
Juan Quintela 2017-03-21 15:23:31 +01:00
parent 06b106889a
commit 269ace2951
1 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
migration/ram.c
View File

@ -171,8 +171,8 @@ struct RAMState {
RAMBlock *last_seen_block; RAMBlock *last_seen_block;
/* Last block from where we have sent data */ /* Last block from where we have sent data */
RAMBlock *last_sent_block; RAMBlock *last_sent_block;
/* Last offset we have sent data from */ /* Last dirty target page we have sent */
ram_addr_t last_offset; ram_addr_t last_page;
/* last ram version we have seen */ /* last ram version we have seen */
uint32_t last_version; uint32_t last_version;
/* We are in the first round */ /* We are in the first round */
@ -1061,7 +1061,7 @@ static bool find_dirty_block(RAMState *rs, PageSearchStatus *pss,
pss->offset = migration_bitmap_find_dirty(rs, pss->block, pss->offset, pss->offset = migration_bitmap_find_dirty(rs, pss->block, pss->offset,
page_abs); page_abs);
if (pss->complete_round && pss->block == rs->last_seen_block && if (pss->complete_round && pss->block == rs->last_seen_block &&
pss->offset >= rs->last_offset) { (pss->offset >> TARGET_PAGE_BITS) >= rs->last_page) {
/* /*
* We've been once around the RAM and haven't found anything. * We've been once around the RAM and haven't found anything.
* Give up. * Give up.
@ -1402,7 +1402,7 @@ static int ram_find_and_save_block(RAMState *rs, bool last_stage)
} }
pss.block = rs->last_seen_block; pss.block = rs->last_seen_block;
pss.offset = rs->last_offset; pss.offset = rs->last_page << TARGET_PAGE_BITS;
pss.complete_round = false; pss.complete_round = false;
if (!pss.block) { if (!pss.block) {
@ -1424,7 +1424,7 @@ static int ram_find_and_save_block(RAMState *rs, bool last_stage)
} while (!pages && again); } while (!pages && again);
rs->last_seen_block = pss.block; rs->last_seen_block = pss.block;
rs->last_offset = pss.offset; rs->last_page = pss.offset >> TARGET_PAGE_BITS;
return pages; return pages;
} }
@ -1499,7 +1499,7 @@ static void ram_state_reset(RAMState *rs)
{ {
rs->last_seen_block = NULL; rs->last_seen_block = NULL;
rs->last_sent_block = NULL; rs->last_sent_block = NULL;
rs->last_offset = 0; rs->last_page = 0;
rs->last_version = ram_list.version; rs->last_version = ram_list.version;
rs->ram_bulk_stage = true; rs->ram_bulk_stage = true;
} }
@ -1844,7 +1844,7 @@ static int postcopy_chunk_hostpages(MigrationState *ms)
/* Easiest way to make sure we don't resume in the middle of a host-page */ /* Easiest way to make sure we don't resume in the middle of a host-page */
rs->last_seen_block = NULL; rs->last_seen_block = NULL;
rs->last_sent_block = NULL; rs->last_sent_block = NULL;
rs->last_offset = 0; rs->last_page = 0;
QLIST_FOREACH_RCU(block, &ram_list.blocks, next) { QLIST_FOREACH_RCU(block, &ram_list.blocks, next) {
unsigned long first = block->offset >> TARGET_PAGE_BITS; unsigned long first = block->offset >> TARGET_PAGE_BITS;