[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-block] [PATCH v7 02/16] migration: fix ram_save_pending
From: |
Vladimir Sementsov-Ogievskiy |
Subject: |
[Qemu-block] [PATCH v7 02/16] migration: fix ram_save_pending |
Date: |
Mon, 10 Jul 2017 19:30:15 +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>
Reviewed-by: Dr. David Alan Gilbert <address@hidden>
Reviewed-by: Juan Quintela <address@hidden>
---
migration/ram.c | 8 ++++++--
1 file changed, 6 insertions(+), 2 deletions(-)
diff --git a/migration/ram.c b/migration/ram.c
index 64d006bc8b..b43589e3d2 100644
--- a/migration/ram.c
+++ b/migration/ram.c
@@ -2068,8 +2068,12 @@ static void ram_save_pending(QEMUFile *f, void *opaque,
uint64_t max_size,
remaining_size = rs->migration_dirty_pages * 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)
--
2.11.1
- [Qemu-block] [PATCH v7 00/16] Dirty bitmaps postcopy migration, Vladimir Sementsov-Ogievskiy, 2017/07/10
- [Qemu-block] [PATCH v7 13/16] iotests: add add_incoming_migration to VM class, Vladimir Sementsov-Ogievskiy, 2017/07/10
- [Qemu-block] [PATCH v7 08/16] migration: include migrate_dirty_bitmaps in migrate_postcopy, Vladimir Sementsov-Ogievskiy, 2017/07/10
- [Qemu-block] [PATCH v7 06/16] qapi: add dirty-bitmaps migration capability, Vladimir Sementsov-Ogievskiy, 2017/07/10
- [Qemu-block] [PATCH v7 02/16] migration: fix ram_save_pending,
Vladimir Sementsov-Ogievskiy <=
- [Qemu-block] [PATCH v7 16/16] iotests: add dirty bitmap postcopy test, Vladimir Sementsov-Ogievskiy, 2017/07/10
- [Qemu-block] [PATCH v7 15/16] iotests: add dirty bitmap migration test, Vladimir Sementsov-Ogievskiy, 2017/07/10
- [Qemu-block] [PATCH v7 03/16] migration: split common postcopy out of ram postcopy, Vladimir Sementsov-Ogievskiy, 2017/07/10
- [Qemu-block] [PATCH v7 14/16] iotests: add default node-name, Vladimir Sementsov-Ogievskiy, 2017/07/10
- [Qemu-block] [PATCH v7 07/16] block/dirty-bitmap: add bdrv_dirty_bitmap_release_successor, Vladimir Sementsov-Ogievskiy, 2017/07/10
- [Qemu-block] [PATCH v7 01/16] migration: add has_postcopy savevm handler, Vladimir Sementsov-Ogievskiy, 2017/07/10
- [Qemu-block] [PATCH v7 05/16] block/dirty-bitmap: add bdrv_dirty_bitmap_enable_successor(), Vladimir Sementsov-Ogievskiy, 2017/07/10
- [Qemu-block] [PATCH v7 11/16] block/dirty-bitmap: add bdrv_dirty_bitmap_set_frozen, Vladimir Sementsov-Ogievskiy, 2017/07/10