[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PULL 13/18] migration: add has_postcopy savevm handler
From: |
Juan Quintela |
Subject: |
[Qemu-devel] [PULL 13/18] migration: add has_postcopy savevm handler |
Date: |
Fri, 22 Sep 2017 01:08:07 +0200 |
From: Vladimir Sementsov-Ogievskiy <address@hidden>
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>
Signed-off-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 a0f1edd8c7..f4f7bdc177 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 bb369e72d4..cedbeae48d 100644
--- a/migration/ram.c
+++ b/migration/ram.c
@@ -2849,11 +2849,17 @@ 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_setup = ram_save_setup,
.save_live_iterate = ram_save_iterate,
.save_live_complete_postcopy = ram_save_complete,
.save_live_complete_precopy = ram_save_complete,
+ .has_postcopy = ram_has_postcopy,
.save_live_pending = ram_save_pending,
.load_state = ram_load,
.save_cleanup = ram_save_cleanup,
diff --git a/migration/savevm.c b/migration/savevm.c
index 7a55023d1a..9a48b7b4cb 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.13.5
- [Qemu-devel] [PULL 03/18] migration: Add comments to channel functions, (continued)
- [Qemu-devel] [PULL 03/18] migration: Add comments to channel functions, Juan Quintela, 2017/09/21
- [Qemu-devel] [PULL 04/18] migration: Create migration_has_all_channels, Juan Quintela, 2017/09/21
- [Qemu-devel] [PULL 06/18] migration: Create x-multifd-channels parameter, Juan Quintela, 2017/09/21
- [Qemu-devel] [PULL 05/18] migration: Add multifd capability, Juan Quintela, 2017/09/21
- [Qemu-devel] [PULL 07/18] migration: Create x-multifd-page-count parameter, Juan Quintela, 2017/09/21
- [Qemu-devel] [PULL 08/18] migration: Create multifd migration threads, Juan Quintela, 2017/09/21
- [Qemu-devel] [PULL 10/18] bitmap: remove BITOP_WORD(), Juan Quintela, 2017/09/21
- [Qemu-devel] [PULL 09/18] migration: Split migration_fd_process_incoming, Juan Quintela, 2017/09/21
- [Qemu-devel] [PULL 11/18] bitmap: introduce bitmap_count_one(), Juan Quintela, 2017/09/21
- [Qemu-devel] [PULL 12/18] bitmap: provide to_le/from_le helpers, Juan Quintela, 2017/09/21
- [Qemu-devel] [PULL 13/18] migration: add has_postcopy savevm handler,
Juan Quintela <=
- [Qemu-devel] [PULL 14/18] migration: fix ram_save_pending, Juan Quintela, 2017/09/21
- [Qemu-devel] [PULL 15/18] migration: split common postcopy out of ram postcopy, Juan Quintela, 2017/09/21
- [Qemu-devel] [PULL 16/18] migration: pass MigrationIncomingState* into migration check functions, Juan Quintela, 2017/09/21
- [Qemu-devel] [PULL 17/18] migration: fix hardcoded function name in error report, Juan Quintela, 2017/09/21
- [Qemu-devel] [PULL 18/18] migration: split ufd_version_check onto receive/request features part, Juan Quintela, 2017/09/21
- Re: [Qemu-devel] [PULL 00/18] Migration PULL request, no-reply, 2017/09/21