diff options
| -rw-r--r-- | migration/migration.c | 9 | ||||
| -rw-r--r-- | migration/savevm.c | 2 |
2 files changed, 5 insertions, 6 deletions
diff --git a/migration/migration.c b/migration/migration.c index c80fc7b94c..fd42a549e6 100644 --- a/migration/migration.c +++ b/migration/migration.c @@ -2742,14 +2742,11 @@ static int migration_completion_precopy(MigrationState *s, goto out_unlock; } - /* - * Inactivate disks except in COLO, and track that we have done so in order - * to remember to reactivate them if migration fails or is cancelled. - */ - s->block_inactive = !migrate_colo(); migration_rate_set(RATE_LIMIT_DISABLED); + + /* Inactivate disks except in COLO */ ret = qemu_savevm_state_complete_precopy(s->to_dst_file, false, - s->block_inactive); + !migrate_colo()); out_unlock: bql_unlock(); return ret; diff --git a/migration/savevm.c b/migration/savevm.c index d4842b519d..3a414aff52 100644 --- a/migration/savevm.c +++ b/migration/savevm.c @@ -1558,6 +1558,8 @@ int qemu_savevm_state_complete_precopy_non_iterable(QEMUFile *f, qemu_file_set_error(f, ret); return ret; } + /* Remember that we did this */ + s->block_inactive = true; } if (!in_postcopy) { /* Postcopy stream will still be going */ |