[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PATCH v3 08/13] migration: Remove MigrationState from block_cleanup_par
From: |
Juan Quintela |
Subject: |
[PATCH v3 08/13] migration: Remove MigrationState from block_cleanup_parameters() |
Date: |
Mon, 24 Apr 2023 20:32:31 +0200 |
This makes the function more regular with everything else.
Signed-off-by: Juan Quintela <quintela@redhat.com>
---
migration/migration.c | 4 ++--
migration/options.c | 4 +++-
migration/options.h | 2 +-
3 files changed, 6 insertions(+), 4 deletions(-)
diff --git a/migration/migration.c b/migration/migration.c
index cefe6da2b8..ef8caa79b9 100644
--- a/migration/migration.c
+++ b/migration/migration.c
@@ -1218,7 +1218,7 @@ static void migrate_fd_cleanup(MigrationState *s)
error_report_err(error_copy(s->error));
}
notifier_list_notify(&migration_state_notifiers, s);
- block_cleanup_parameters(s);
+ block_cleanup_parameters();
yank_unregister_instance(MIGRATION_YANK_INSTANCE);
}
@@ -1712,7 +1712,7 @@ void qmp_migrate(const char *uri, bool has_blk, bool blk,
"a valid migration protocol");
migrate_set_state(&s->state, MIGRATION_STATUS_SETUP,
MIGRATION_STATUS_FAILED);
- block_cleanup_parameters(s);
+ block_cleanup_parameters();
return;
}
diff --git a/migration/options.c b/migration/options.c
index 26fe00799b..f65b7babef 100644
--- a/migration/options.c
+++ b/migration/options.c
@@ -597,8 +597,10 @@ void migrate_set_block_incremental(bool value)
/* parameters helpers */
-void block_cleanup_parameters(MigrationState *s)
+void block_cleanup_parameters(void)
{
+ MigrationState *s = migrate_get_current();
+
if (s->must_remove_block_options) {
/* setting to false can never fail */
migrate_cap_set(MIGRATION_CAPABILITY_BLOCK, false, &error_abort);
diff --git a/migration/options.h b/migration/options.h
index 1fc8d341dd..3948218dbe 100644
--- a/migration/options.h
+++ b/migration/options.h
@@ -90,6 +90,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);
+void block_cleanup_parameters(void);
#endif
--
2.39.2
- [PATCH v3 06/13] migration: Move migrate_set_block_incremental() to options.c, (continued)
- [PATCH v3 06/13] migration: Move migrate_set_block_incremental() to options.c, Juan Quintela, 2023/04/24
- [PATCH v3 11/13] migration: Create migrate_tls_hostname() function, Juan Quintela, 2023/04/24
- [PATCH v3 09/13] migration: Create migrate_tls_creds() function, Juan Quintela, 2023/04/24
- [PATCH v3 12/13] migration: Create migrate_block_bitmap_mapping() function, Juan Quintela, 2023/04/24
- [PATCH v3 08/13] migration: Remove MigrationState from block_cleanup_parameters(),
Juan Quintela <=
- [PATCH v3 10/13] migration: Create migrate_tls_authz() function, Juan Quintela, 2023/04/24
- [PATCH v3 13/13] migration: Move migration_properties to options.c, Juan Quintela, 2023/04/24