[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PULL 05/18] migration: Move migrate_set_block_incremental() to options.
From: |
Juan Quintela |
Subject: |
[PULL 05/18] migration: Move migrate_set_block_incremental() to options.c |
Date: |
Thu, 27 Apr 2023 17:22:21 +0200 |
Once there, make it more regular and remove the need for
MigrationState parameter.
Signed-off-by: Juan Quintela <quintela@redhat.com>
Reviewed-by: Vladimir Sementsov-Ogievskiy <vsementsov@yandex-team.ru>
---
migration/migration.c | 9 ++-------
migration/options.c | 9 +++++++++
migration/options.h | 4 ++++
3 files changed, 15 insertions(+), 7 deletions(-)
diff --git a/migration/migration.c b/migration/migration.c
index ee8e9416ce..9a42f73aeb 100644
--- a/migration/migration.c
+++ b/migration/migration.c
@@ -1164,17 +1164,12 @@ void migrate_set_state(int *state, int old_state, int
new_state)
}
}
-static void migrate_set_block_incremental(MigrationState *s, bool value)
-{
- s->parameters.block_incremental = value;
-}
-
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(s, false);
+ migrate_set_block_incremental(false);
s->must_remove_block_options = false;
}
}
@@ -1668,7 +1663,7 @@ static bool migrate_prepare(MigrationState *s, bool blk,
bool blk_inc,
}
if (blk_inc) {
- migrate_set_block_incremental(s, true);
+ migrate_set_block_incremental(true);
}
migrate_init(s);
diff --git a/migration/options.c b/migration/options.c
index f4ffe99603..89508d91a3 100644
--- a/migration/options.c
+++ b/migration/options.c
@@ -589,6 +589,15 @@ uint64_t migrate_xbzrle_cache_size(void)
return s->parameters.xbzrle_cache_size;
}
+/* parameter setters */
+
+void migrate_set_block_incremental(bool value)
+{
+ MigrationState *s = migrate_get_current();
+
+ s->parameters.block_incremental = value;
+}
+
/* parameters helpers */
AnnounceParameters *migrate_announce_params(void)
diff --git a/migration/options.h b/migration/options.h
index e982103c0d..d261a25441 100644
--- a/migration/options.h
+++ b/migration/options.h
@@ -82,6 +82,10 @@ int migrate_multifd_zstd_level(void);
uint8_t migrate_throttle_trigger_threshold(void);
uint64_t migrate_xbzrle_cache_size(void);
+/* parameters setters */
+
+void migrate_set_block_incremental(bool value);
+
/* parameters helpers */
bool migrate_params_check(MigrationParameters *params, Error **errp);
--
2.40.0
- [PULL 00/18] Migration 20230427 patches, Juan Quintela, 2023/04/27
- [PULL 04/18] migration: Create migrate_downtime_limit() function, Juan Quintela, 2023/04/27
- [PULL 10/18] migration: Create migrate_tls_hostname() function, Juan Quintela, 2023/04/27
- [PULL 06/18] migration: Move block_cleanup_parameters() to options.c, Juan Quintela, 2023/04/27
- [PULL 01/18] multifd: Fix the number of channels ready, Juan Quintela, 2023/04/27
- [PULL 17/18] migration: Make dirty_pages_rate atomic, Juan Quintela, 2023/04/27
- [PULL 14/18] multifd: Protect multifd_send_sync_main() calls, Juan Quintela, 2023/04/27
- [PULL 13/18] multifd: Create property multifd-flush-after-each-section, Juan Quintela, 2023/04/27
- [PULL 05/18] migration: Move migrate_set_block_incremental() to options.c,
Juan Quintela <=
- [PULL 16/18] stat64: Add stat64_set() operation, Juan Quintela, 2023/04/27
- [PULL 18/18] migration: Make dirty_bytes_last_sync atomic, Juan Quintela, 2023/04/27
- [PULL 07/18] migration: Remove MigrationState from block_cleanup_parameters(), Juan Quintela, 2023/04/27
- [PULL 08/18] migration: Create migrate_tls_creds() function, Juan Quintela, 2023/04/27
- [PULL 15/18] multifd: Only flush once each full round of memory, Juan Quintela, 2023/04/27
- [PULL 11/18] migration: Create migrate_block_bitmap_mapping() function, Juan Quintela, 2023/04/27
- [PULL 09/18] migration: Create migrate_tls_authz() function, Juan Quintela, 2023/04/27
- [PULL 02/18] migration: Create migrate_params_init() function, Juan Quintela, 2023/04/27
- [PULL 12/18] migration: Move migration_properties to options.c, Juan Quintela, 2023/04/27
- [PULL 03/18] migration: Make all functions check have the same format, Juan Quintela, 2023/04/27