diff options
Diffstat (limited to 'migration')
| -rw-r--r-- | migration/migration.c | 13 | ||||
| -rw-r--r-- | migration/savevm.c | 9 |
2 files changed, 4 insertions, 18 deletions
diff --git a/migration/migration.c b/migration/migration.c index 799952ce99..a5ade23e24 100644 --- a/migration/migration.c +++ b/migration/migration.c @@ -338,20 +338,11 @@ static void process_incoming_migration_bh(void *opaque) Error *local_err = NULL; MigrationIncomingState *mis = opaque; - /* Make sure all file formats flush their mutable metadata */ + /* Make sure all file formats flush their mutable metadata. + * If we get an error here, just don't restart the VM yet. */ bdrv_invalidate_cache_all(&local_err); if (local_err) { - migrate_set_state(&mis->state, MIGRATION_STATUS_ACTIVE, - MIGRATION_STATUS_FAILED); error_report_err(local_err); - migrate_decompress_threads_join(); - exit(EXIT_FAILURE); - } - - /* If we get an error here, just don't restart the VM yet. */ - blk_resume_after_migration(&local_err); - if (local_err) { - error_free(local_err); local_err = NULL; autostart = false; } diff --git a/migration/savevm.c b/migration/savevm.c index 352a8f23b5..7f66d58a7e 100644 --- a/migration/savevm.c +++ b/migration/savevm.c @@ -1612,16 +1612,11 @@ static void loadvm_postcopy_handle_run_bh(void *opaque) qemu_announce_self(); - /* Make sure all file formats flush their mutable metadata */ + /* Make sure all file formats flush their mutable metadata. + * If we get an error here, just don't restart the VM yet. */ bdrv_invalidate_cache_all(&local_err); if (local_err) { error_report_err(local_err); - } - - /* If we get an error here, just don't restart the VM yet. */ - blk_resume_after_migration(&local_err); - if (local_err) { - error_free(local_err); local_err = NULL; autostart = false; } |