diff options
| author | Kevin Wolf <kwolf@redhat.com> | 2017-05-04 18:52:37 +0200 |
|---|---|---|
| committer | Kevin Wolf <kwolf@redhat.com> | 2017-05-11 12:08:24 +0200 |
| commit | 4417ab7adf1613799054be5afedf810fc2524ee8 (patch) | |
| tree | 07b0be1c2077c7eecddab8e36fe4af21140b43d7 /migration | |
| parent | ace21a58751824f9a3d399e332317233e880de3a (diff) | |
block: New BdrvChildRole.activate() for blk_resume_after_migration()
Instead of manually calling blk_resume_after_migration() in migration
code after doing bdrv_invalidate_cache_all(), integrate the BlockBackend
activation with cache invalidation into a single function. This is
achieved with a new callback in BdrvChildRole that is called by
bdrv_invalidate_cache_all().
Signed-off-by: Kevin Wolf <kwolf@redhat.com>
Reviewed-by: Eric Blake <eblake@redhat.com>
Diffstat (limited to 'migration')
| -rw-r--r-- | migration/migration.c | 3 | ||||
| -rw-r--r-- | migration/savevm.c | 3 |
2 files changed, 0 insertions, 6 deletions
diff --git a/migration/migration.c b/migration/migration.c index 04af71988d..a5ade23e24 100644 --- a/migration/migration.c +++ b/migration/migration.c @@ -341,9 +341,6 @@ static void process_incoming_migration_bh(void *opaque) /* 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) { - blk_resume_after_migration(&local_err); - } if (local_err) { error_report_err(local_err); local_err = NULL; diff --git a/migration/savevm.c b/migration/savevm.c index 3ca8d11704..7f66d58a7e 100644 --- a/migration/savevm.c +++ b/migration/savevm.c @@ -1615,9 +1615,6 @@ static void loadvm_postcopy_handle_run_bh(void *opaque) /* 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) { - blk_resume_after_migration(&local_err); - } if (local_err) { error_report_err(local_err); local_err = NULL; |