[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH 49/54] ram: Remember last_page instead of last_offse
From: |
Juan Quintela |
Subject: |
[Qemu-devel] [PATCH 49/54] ram: Remember last_page instead of last_offset |
Date: |
Thu, 6 Apr 2017 15:09:08 +0200 |
Signed-off-by: Juan Quintela <address@hidden>
--
Improve comment
Fix typo
Signed-off-by: Juan Quintela <address@hidden>
---
migration/ram.c | 14 +++++++-------
1 file changed, 7 insertions(+), 7 deletions(-)
diff --git a/migration/ram.c b/migration/ram.c
index 52ab14b..5b2045d 100644
--- a/migration/ram.c
+++ b/migration/ram.c
@@ -171,8 +171,8 @@ struct RAMState {
RAMBlock *last_seen_block;
/* Last block from where we have sent data */
RAMBlock *last_sent_block;
- /* Last offset we have sent data from */
- ram_addr_t last_offset;
+ /* Last dirty targe page we have sent */
+ ram_addr_t last_page;
/* last ram version we have seen */
uint32_t last_version;
/* 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,
page_abs);
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.
* 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.offset = rs->last_offset;
+ pss.offset = rs->last_page << TARGET_PAGE_BITS;
pss.complete_round = false;
if (!pss.block) {
@@ -1424,7 +1424,7 @@ static int ram_find_and_save_block(RAMState *rs, bool
last_stage)
} while (!pages && again);
rs->last_seen_block = pss.block;
- rs->last_offset = pss.offset;
+ rs->last_page = pss.offset >> TARGET_PAGE_BITS;
return pages;
}
@@ -1499,7 +1499,7 @@ static void ram_state_reset(RAMState *rs)
{
rs->last_seen_block = NULL;
rs->last_sent_block = NULL;
- rs->last_offset = 0;
+ rs->last_page = 0;
rs->last_version = ram_list.version;
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 */
rs->last_seen_block = NULL;
rs->last_sent_block = NULL;
- rs->last_offset = 0;
+ rs->last_page = 0;
QLIST_FOREACH_RCU(block, &ram_list.blocks, next) {
unsigned long first = block->offset >> TARGET_PAGE_BITS;
--
2.9.3
- Re: [Qemu-devel] [PATCH 40/54] ram: Remove compression_switch and inline its logic, (continued)
- [Qemu-devel] [PATCH 43/54] ram: Rename qemu_target_page_bits() to qemu_target_page_size(), Juan Quintela, 2017/04/06
- [Qemu-devel] [PATCH 41/54] migration: Remove MigrationState from migration_in_postcopy, Juan Quintela, 2017/04/06
- [Qemu-devel] [PATCH 42/54] ram: We don't need MigrationState parameter anymore, Juan Quintela, 2017/04/06
- [Qemu-devel] [PATCH 45/54] ram: Pass RAMBlock to bitmap_sync, Juan Quintela, 2017/04/06
- [Qemu-devel] [PATCH 46/54] ram: ram_discard_range() don't use the mis parameter, Juan Quintela, 2017/04/06
- [Qemu-devel] [PATCH 44/54] ram: Add page-size to output in 'info migrate', Juan Quintela, 2017/04/06
- [Qemu-devel] [PATCH 47/54] ram: reorganize last_sent_block, Juan Quintela, 2017/04/06
- [Qemu-devel] [PATCH 49/54] ram: Remember last_page instead of last_offset,
Juan Quintela <=
- [Qemu-devel] [PATCH 48/54] ram: Use page number instead of an address for the bitmap operations, Juan Quintela, 2017/04/06
- [Qemu-devel] [PATCH 50/54] ram: Change offset field in PageSearchStatus to page, Juan Quintela, 2017/04/06
- [Qemu-devel] [PATCH 51/54] ram: Use ramblock and page offset instead of absolute offset, Juan Quintela, 2017/04/06
- [Qemu-devel] [PATCH 52/54] ram: rename last_ram_offset() last_ram_pages(), Juan Quintela, 2017/04/06
- [Qemu-devel] [PATCH 53/54] ram: Use RAMBitmap type for coherence, Juan Quintela, 2017/04/06
- [Qemu-devel] [PATCH 54/54] migration: Remove MigrationState parameter from migration_is_idle(), Juan Quintela, 2017/04/06