[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-block] [PATCH 02/18] migration: fix ram_save_pending
From: |
Vladimir Sementsov-Ogievskiy |
Subject: |
[Qemu-block] [PATCH 02/18] migration: fix ram_save_pending |
Date: |
Tue, 16 Aug 2016 13:25:59 +0300 |
Fill postcopy-able pending only if ram postcopy is enabled.
It is necessary because of there will be other postcopy-able states and
when ram postcopy is disabled, it should not spoil common postcopy
related pending.
Signed-off-by: Vladimir Sementsov-Ogievskiy <address@hidden>
---
migration/ram.c | 8 ++++++--
1 file changed, 6 insertions(+), 2 deletions(-)
diff --git a/migration/ram.c b/migration/ram.c
index fa5c72b..424ce0b 100644
--- a/migration/ram.c
+++ b/migration/ram.c
@@ -2079,8 +2079,12 @@ static void ram_save_pending(QEMUFile *f, void *opaque,
uint64_t max_size,
remaining_size = ram_save_remaining() * TARGET_PAGE_SIZE;
}
- /* We can do postcopy, and all the data is postcopiable */
- *postcopiable_pending += remaining_size;
+ if (migrate_postcopy_ram()) {
+ /* We can do postcopy, and all the data is postcopiable */
+ *postcopiable_pending += remaining_size;
+ } else {
+ *non_postcopiable_pending += remaining_size;
+ }
}
static int load_xbzrle(QEMUFile *f, ram_addr_t addr, void *host)
--
1.8.3.1
- [Qemu-block] [PATCH 11/18] migration: add is_active_iterate handler, (continued)
- [Qemu-block] [PATCH 11/18] migration: add is_active_iterate handler, Vladimir Sementsov-Ogievskiy, 2016/08/16
- [Qemu-block] [PATCH 03/18] migration: split common postcopy out of ram postcopy, Vladimir Sementsov-Ogievskiy, 2016/08/16
- [Qemu-block] [PATCH 01/18] migration: add has_postcopy savevm handler, Vladimir Sementsov-Ogievskiy, 2016/08/16
- [Qemu-block] [PATCH 05/18] block: add bdrv_next_dirty_bitmap(), Vladimir Sementsov-Ogievskiy, 2016/08/16
- [Qemu-block] [PATCH 15/18] qapi: add md5 checksum of last dirty bitmap level to query-block, Vladimir Sementsov-Ogievskiy, 2016/08/16
- [Qemu-block] [PATCH 18/18] iotests: add dirty bitmap postcopy test, Vladimir Sementsov-Ogievskiy, 2016/08/16
- [Qemu-block] [PATCH 12/18] migration: add postcopy migration of dirty bitmaps, Vladimir Sementsov-Ogievskiy, 2016/08/16
- [Qemu-block] [PATCH 14/18] iotests: add add_incoming_migration to VM class, Vladimir Sementsov-Ogievskiy, 2016/08/16
- [Qemu-block] [PATCH 02/18] migration: fix ram_save_pending,
Vladimir Sementsov-Ogievskiy <=
- [Qemu-block] [PATCH 16/18] iotests: add default node-name, Vladimir Sementsov-Ogievskiy, 2016/08/16
- [Qemu-block] [PATCH 04/18] migration: introduce postcopy-only pending, Vladimir Sementsov-Ogievskiy, 2016/08/16
- [Qemu-block] [PATCH 09/18] migration: include migrate_dirty_bitmaps in migrate_postcopy, Vladimir Sementsov-Ogievskiy, 2016/08/16
- [Qemu-block] [PATCH 13/18] iotests: maintain several vms in test, Vladimir Sementsov-Ogievskiy, 2016/08/16
- Re: [Qemu-block] [PATCH 00/18] Dirty bitmaps postcopy migration, Fam Zheng, 2016/08/17
- Re: [Qemu-block] [PATCH 00/18] Dirty bitmaps postcopy migration, Dr. David Alan Gilbert, 2016/08/17