[PATCH 37/43] migration: Move block_cleanup_parameters() to options.c

[Juan Quintela]

Signed-off-by: Juan Quintela <quint...@redhat.com>
---
 migration/options.h   |  1 +
 migration/migration.c | 10 ----------
 migration/options.c   | 10 ++++++++++
 3 files changed, 11 insertions(+), 10 deletions(-)

diff --git a/migration/options.h b/migration/options.h
index 0fbe294a65..bd1945d3d1 100644
--- a/migration/options.h
+++ b/migration/options.h
@@ -92,5 +92,6 @@ void migrate_set_block_incremental(bool value);
 
 bool migrate_params_check(MigrationParameters *params, Error **errp);
 void migrate_params_init(MigrationParameters *params);
+void block_cleanup_parameters(MigrationState *s);
 
 #endif
diff --git a/migration/migration.c b/migration/migration.c
index f293fb1fd6..5dc0bc86f1 100644
--- a/migration/migration.c
+++ b/migration/migration.c
@@ -1162,16 +1162,6 @@ void migrate_set_state(int *state, int old_state, int 
new_state)
     }
 }
 
-static void block_cleanup_parameters(MigrationState *s)
-{
-    if (s->must_remove_block_options) {
-        /* setting to false can never fail */
-        migrate_cap_set(MIGRATION_CAPABILITY_BLOCK, false, &error_abort);
-        migrate_set_block_incremental(false);
-        s->must_remove_block_options = false;
-    }
-}
-
 static void migrate_fd_cleanup(MigrationState *s)
 {
     qemu_bh_delete(s->cleanup_bh);
diff --git a/migration/options.c b/migration/options.c
index 7838515991..f7d46ccfc9 100644
--- a/migration/options.c
+++ b/migration/options.c
@@ -601,6 +601,16 @@ void migrate_set_block_incremental(bool value)
 
 /* parameters helpers */
 
+void block_cleanup_parameters(MigrationState *s)
+{
+    if (s->must_remove_block_options) {
+        /* setting to false can never fail */
+        migrate_cap_set(MIGRATION_CAPABILITY_BLOCK, false, &error_abort);
+        migrate_set_block_incremental(false);
+        s->must_remove_block_options = false;
+    }
+}
+
 AnnounceParameters *migrate_announce_params(void)
 {
     static AnnounceParameters ap;
-- 
2.39.2