From 4417ab7adf1613799054be5afedf810fc2524ee8 Mon Sep 17 00:00:00 2001 From: Kevin Wolf Date: Thu, 4 May 2017 18:52:37 +0200 Subject: 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 Reviewed-by: Eric Blake --- migration/migration.c | 3 --- 1 file changed, 3 deletions(-) (limited to 'migration/migration.c') 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; -- cgit v1.2.3