[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PULL 11/18] migration: Create migrate_block_bitmap_mapping() function
From: |
Juan Quintela |
Subject: |
[PULL 11/18] migration: Create migrate_block_bitmap_mapping() function |
Date: |
Thu, 27 Apr 2023 17:22:27 +0200 |
Notice that we changed the test of ->has_block_bitmap_mapping
for the test that block_bitmap_mapping is not NULL.
Signed-off-by: Juan Quintela <quintela@redhat.com>
Reviewed-by: Vladimir Sementsov-Ogievskiy <vsementsov@yandex-team.ru>
---
Make it return const (vladimir)
---
migration/block-dirty-bitmap.c | 14 ++++++++------
migration/options.c | 7 +++++++
migration/options.h | 1 +
3 files changed, 16 insertions(+), 6 deletions(-)
diff --git a/migration/block-dirty-bitmap.c b/migration/block-dirty-bitmap.c
index a6ffae0002..6624f39bc6 100644
--- a/migration/block-dirty-bitmap.c
+++ b/migration/block-dirty-bitmap.c
@@ -605,11 +605,12 @@ static int init_dirty_bitmap_migration(DBMSaveState *s)
SaveBitmapState *dbms;
GHashTable *handled_by_blk = g_hash_table_new(NULL, NULL);
BlockBackend *blk;
- const MigrationParameters *mig_params = &migrate_get_current()->parameters;
GHashTable *alias_map = NULL;
+ const BitmapMigrationNodeAliasList *block_bitmap_mapping =
+ migrate_block_bitmap_mapping();
- if (mig_params->has_block_bitmap_mapping) {
- alias_map = construct_alias_map(mig_params->block_bitmap_mapping, true,
+ if (block_bitmap_mapping) {
+ alias_map = construct_alias_map(block_bitmap_mapping, true,
&error_abort);
}
@@ -1158,7 +1159,8 @@ static int dirty_bitmap_load_header(QEMUFile *f,
DBMLoadState *s,
static int dirty_bitmap_load(QEMUFile *f, void *opaque, int version_id)
{
GHashTable *alias_map = NULL;
- const MigrationParameters *mig_params = &migrate_get_current()->parameters;
+ const BitmapMigrationNodeAliasList *block_bitmap_mapping =
+ migrate_block_bitmap_mapping();
DBMLoadState *s = &((DBMState *)opaque)->load;
int ret = 0;
@@ -1170,8 +1172,8 @@ static int dirty_bitmap_load(QEMUFile *f, void *opaque,
int version_id)
return -EINVAL;
}
- if (mig_params->has_block_bitmap_mapping) {
- alias_map = construct_alias_map(mig_params->block_bitmap_mapping,
+ if (block_bitmap_mapping) {
+ alias_map = construct_alias_map(block_bitmap_mapping,
false, &error_abort);
}
diff --git a/migration/options.c b/migration/options.c
index 1aa9575bc0..1840a3b220 100644
--- a/migration/options.c
+++ b/migration/options.c
@@ -455,6 +455,13 @@ void
qmp_migrate_set_capabilities(MigrationCapabilityStatusList *params,
/* parameters */
+const BitmapMigrationNodeAliasList *migrate_block_bitmap_mapping(void)
+{
+ MigrationState *s = migrate_get_current();
+
+ return s->parameters.block_bitmap_mapping;
+}
+
bool migrate_block_incremental(void)
{
MigrationState *s = migrate_get_current();
diff --git a/migration/options.h b/migration/options.h
index 819c1b1ce3..9bcb9e558c 100644
--- a/migration/options.h
+++ b/migration/options.h
@@ -62,6 +62,7 @@ bool migrate_cap_set(int cap, bool value, Error **errp);
/* parameters */
+const BitmapMigrationNodeAliasList *migrate_block_bitmap_mapping(void);
bool migrate_block_incremental(void);
uint32_t migrate_checkpoint_delay(void);
int migrate_compress_level(void);
--
2.40.0
- [PULL 01/18] multifd: Fix the number of channels ready, (continued)
- [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, 2023/04/27
- [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 <=
- [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
- Re: [PULL 00/18] Migration 20230427 patches, Richard Henderson, 2023/04/28