[<prev] [next>] [<thread-prev] [thread-next>] [day] [month] [year] [list]
Date: Thu, 3 Mar 2016 18:44:27 +0800
From: Liang Li <liang.z.li@...el.com>
To: quintela@...hat.com, amit.shah@...hat.com, qemu-devel@...gnu.org,
linux-kernel@...r.kernel.org
Cc: mst@...hat.com, akpm@...ux-foundation.org, pbonzini@...hat.com,
rth@...ddle.net, ehabkost@...hat.com, linux-mm@...ck.org,
virtualization@...ts.linux-foundation.org, kvm@...r.kernel.org,
dgilbert@...hat.com, Liang Li <liang.z.li@...el.com>
Subject: [RFC qemu 3/4] migration: not set migration bitmap in setup stage
Set ram_list.dirty_memory instead of migration bitmap, the migration
bitmap will be update when doing migration_bitmap_sync().
Set migration_dirty_pages to 0 and it will be updated by
migration_dirty_pages() too.
The following patch is based on this change.
Signed-off-by: Liang Li <liang.z.li@...el.com>
---
migration/ram.c | 12 ++++++------
1 file changed, 6 insertions(+), 6 deletions(-)
diff --git a/migration/ram.c b/migration/ram.c
index 704f6a9..ee2547d 100644
--- a/migration/ram.c
+++ b/migration/ram.c
@@ -1931,19 +1931,19 @@ static int ram_save_setup(QEMUFile *f, void *opaque)
ram_bitmap_pages = last_ram_offset() >> TARGET_PAGE_BITS;
migration_bitmap_rcu = g_new0(struct BitmapRcu, 1);
migration_bitmap_rcu->bmap = bitmap_new(ram_bitmap_pages);
- bitmap_set(migration_bitmap_rcu->bmap, 0, ram_bitmap_pages);
if (migrate_postcopy_ram()) {
migration_bitmap_rcu->unsentmap = bitmap_new(ram_bitmap_pages);
bitmap_set(migration_bitmap_rcu->unsentmap, 0, ram_bitmap_pages);
}
- /*
- * Count the total number of pages used by ram blocks not including any
- * gaps due to alignment or unplugs.
- */
- migration_dirty_pages = ram_bytes_total() >> TARGET_PAGE_BITS;
+ migration_dirty_pages = 0;
+ QLIST_FOREACH_RCU(block, &ram_list.blocks, next) {
+ cpu_physical_memory_set_dirty_range(block->offset,
+ block->used_length,
+ DIRTY_MEMORY_MIGRATION);
+ }
memory_global_dirty_log_start();
migration_bitmap_sync();
qemu_mutex_unlock_ramlist();
--
1.8.3.1
Powered by blists - more mailing lists