[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-block] [PATCH v7 01/16] migration: add has_postcopy savevm handler
From: |
Vladimir Sementsov-Ogievskiy |
Subject: |
[Qemu-block] [PATCH v7 01/16] migration: add has_postcopy savevm handler |
Date: |
Mon, 10 Jul 2017 19:30:14 +0300 |
Now postcopy-able states are recognized by not NULL
save_live_complete_postcopy handler. But when we have several different
postcopy-able states, it is not convenient. Ram postcopy may be
disabled, while some other postcopy enabled, in this case Ram state
should behave as it is not postcopy-able.
This patch add separate has_postcopy handler to specify behaviour of
savevm state.
Signed-off-by: Vladimir Sementsov-Ogievskiy <address@hidden>
Reviewed-by: Juan Quintela <address@hidden>
---
include/migration/register.h | 1 +
migration/ram.c | 6 ++++++
migration/savevm.c | 6 ++++--
3 files changed, 11 insertions(+), 2 deletions(-)
diff --git a/include/migration/register.h b/include/migration/register.h
index d9498d95eb..b999917c9d 100644
--- a/include/migration/register.h
+++ b/include/migration/register.h
@@ -24,6 +24,7 @@ typedef struct SaveVMHandlers {
/* This runs both outside and inside the iothread lock. */
bool (*is_active)(void *opaque);
+ bool (*has_postcopy)(void *opaque);
/* This runs outside the iothread lock in the migration case, and
* within the lock in the savevm case. The callback had better only
diff --git a/migration/ram.c b/migration/ram.c
index 0baa1e0d56..64d006bc8b 100644
--- a/migration/ram.c
+++ b/migration/ram.c
@@ -2622,10 +2622,16 @@ static int ram_load(QEMUFile *f, void *opaque, int
version_id)
return ret;
}
+static bool ram_has_postcopy(void *opaque)
+{
+ return migrate_postcopy_ram();
+}
+
static SaveVMHandlers savevm_ram_handlers = {
.save_live_setup = ram_save_setup,
.save_live_iterate = ram_save_iterate,
.save_live_complete_postcopy = ram_save_complete,
+ .has_postcopy = ram_has_postcopy,
.save_live_complete_precopy = ram_save_complete,
.save_live_pending = ram_save_pending,
.load_state = ram_load,
diff --git a/migration/savevm.c b/migration/savevm.c
index be3f885119..37da83509f 100644
--- a/migration/savevm.c
+++ b/migration/savevm.c
@@ -1008,7 +1008,8 @@ int qemu_savevm_state_iterate(QEMUFile *f, bool postcopy)
* call that's already run, it might get confused if we call
* iterate afterwards.
*/
- if (postcopy && !se->ops->save_live_complete_postcopy) {
+ if (postcopy &&
+ !(se->ops->has_postcopy && se->ops->has_postcopy(se->opaque))) {
continue;
}
if (qemu_file_rate_limit(f)) {
@@ -1097,7 +1098,8 @@ int qemu_savevm_state_complete_precopy(QEMUFile *f, bool
iterable_only,
QTAILQ_FOREACH(se, &savevm_state.handlers, entry) {
if (!se->ops ||
- (in_postcopy && se->ops->save_live_complete_postcopy) ||
+ (in_postcopy && se->ops->has_postcopy &&
+ se->ops->has_postcopy(se->opaque)) ||
(in_postcopy && !iterable_only) ||
!se->ops->save_live_complete_precopy) {
continue;
--
2.11.1
- [Qemu-block] [PATCH v7 06/16] qapi: add dirty-bitmaps migration capability, (continued)
- [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, 2017/07/10
- [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 <=
- [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
- [Qemu-block] [PATCH v7 09/16] migration/qemu-file: add qemu_put_counted_string(), Vladimir Sementsov-Ogievskiy, 2017/07/10
- [Qemu-block] [PATCH v7 10/16] migration: add is_active_iterate handler, Vladimir Sementsov-Ogievskiy, 2017/07/10
- [Qemu-block] [PATCH v7 04/16] migration: introduce postcopy-only pending, Vladimir Sementsov-Ogievskiy, 2017/07/10
- [Qemu-block] [PATCH v7 12/16] migration: add postcopy migration of dirty bitmaps, Vladimir Sementsov-Ogievskiy, 2017/07/10