diff mbox series

[20/43] migration: Move migrate_use_block_incremental() to option.c

Message ID 20230302163410.11399-21-quintela@redhat.com
State New
Headers show
Series Migration: Create options.c for capabilities/params/properties | expand

Commit Message

Juan Quintela March 2, 2023, 4:33 p.m. UTC 
To be consistent with every other parameter, rename to migrate_block_incremental().

Signed-off-by: Juan Quintela <quintela@redhat.com>
---
 migration/migration.h |  1 -
 migration/options.h   |  1 +
 migration/block.c     |  2 +-
 migration/migration.c | 11 +----------
 migration/options.c   |  9 +++++++++
 5 files changed, 12 insertions(+), 12 deletions(-)
diff mbox series

Patch

diff --git a/migration/migration.h b/migration/migration.h
index 5509924c57..bf24a0d471 100644
--- a/migration/migration.h
+++ b/migration/migration.h
@@ -412,7 +412,6 @@  bool migrate_postcopy(void);
 
 int migrate_use_tls(void);
 
-bool migrate_use_block_incremental(void);
 int migrate_max_cpu_throttle(void);
 
 uint64_t ram_get_total_transferred_pages(void);
diff --git a/migration/options.h b/migration/options.h
index 1c1f1a6d47..ea45c87cfe 100644
--- a/migration/options.h
+++ b/migration/options.h
@@ -47,6 +47,7 @@  bool migrate_cap_set(int cap, bool value, Error **errp);
 
 /* parameters */
 
+bool migrate_block_incremental(void);
 int migrate_compress_level(void);
 int migrate_compress_threads(void);
 int migrate_compress_wait_thread(void);
diff --git a/migration/block.c b/migration/block.c
index 2cacd5a184..11541a28ff 100644
--- a/migration/block.c
+++ b/migration/block.c
@@ -418,7 +418,7 @@  static int init_blk_migration(QEMUFile *f)
         bmds->bulk_completed = 0;
         bmds->total_sectors = sectors;
         bmds->completed_sectors = 0;
-        bmds->shared_base = migrate_use_block_incremental();
+        bmds->shared_base = migrate_block_incremental();
 
         assert(i < num_bs);
         bmds_bs[i].bmds = bmds;
diff --git a/migration/migration.c b/migration/migration.c
index 713eba06ac..62478ac8c1 100644
--- a/migration/migration.c
+++ b/migration/migration.c
@@ -2155,7 +2155,7 @@  static bool migrate_prepare(MigrationState *s, bool blk, bool blk_inc,
             error_setg(errp, "No disk migration is required in COLO mode");
             return false;
         }
-        if (migrate_block() || migrate_use_block_incremental()) {
+        if (migrate_block() || migrate_block_incremental()) {
             error_setg(errp, "Command options are incompatible with "
                        "current migration capabilities");
             return false;
@@ -2271,15 +2271,6 @@  int migrate_use_tls(void)
     return s->parameters.tls_creds && *s->parameters.tls_creds;
 }
 
-bool migrate_use_block_incremental(void)
-{
-    MigrationState *s;
-
-    s = migrate_get_current();
-
-    return s->parameters.block_incremental;
-}
-
 /* migration thread support */
 /*
  * Something bad happened to the RP stream, mark an error
diff --git a/migration/options.c b/migration/options.c
index cd5a131c69..b2f15eda6c 100644
--- a/migration/options.c
+++ b/migration/options.c
@@ -465,6 +465,15 @@  void qmp_migrate_set_capabilities(MigrationCapabilityStatusList *params,
 
 /* parameters */
 
+bool migrate_block_incremental(void)
+{
+    MigrationState *s;
+
+    s = migrate_get_current();
+
+    return s->parameters.block_incremental;
+}
+
 int migrate_compress_level(void)
 {
     MigrationState *s;