[DON'T MERGE]
We were abusing capabilities and parameters to implement -i/-b.
Previous patch convert that options into one error. Remove all the
helpers needed to implement them.
Signed-off-by: Juan Quintela <quint...@redhat.com>
---
migration/migration.h | 4 ----
migration/options.h | 6 ------
migration/migration.c | 2 --
migration/options.c | 41 -----------------------------------------
4 files changed, 53 deletions(-)
diff --git a/migration/migration.h b/migration/migration.h
index cd5534337c..ae53d9b26a 100644
--- a/migration/migration.h
+++ b/migration/migration.h
@@ -382,10 +382,6 @@ struct MigrationState {
/* mutex to protect errp */
QemuMutex error_mutex;
- /* Do we have to clean up -b/-i from old migrate parameters */
- /* This feature is deprecated and will be removed */
- bool must_remove_block_options;
-
/*
* Global switch on whether we need to store the global state
* during migration.
diff --git a/migration/options.h b/migration/options.h
index 045e2a41a2..4e8c0b9223 100644
--- a/migration/options.h
+++ b/migration/options.h
@@ -61,7 +61,6 @@ bool migrate_tls(void);
/* capabilities helpers */
bool migrate_caps_check(bool *old_caps, bool *new_caps, Error **errp);
-bool migrate_cap_set(int cap, bool value, Error **errp);
/* parameters */
@@ -91,14 +90,9 @@ const char *migrate_tls_creds(void);
const char *migrate_tls_hostname(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);
void migrate_params_init(MigrationParameters *params);
-void block_cleanup_parameters(void);
#endif
diff --git a/migration/migration.c b/migration/migration.c
index 50fc112e98..ceeb2e6cb2 100644
--- a/migration/migration.c
+++ b/migration/migration.c
@@ -1205,7 +1205,6 @@ static void migrate_fd_cleanup(MigrationState *s)
error_report_err(error_copy(s->error));
}
notifier_list_notify(&migration_state_notifiers, s);
- block_cleanup_parameters();
yank_unregister_instance(MIGRATION_YANK_INSTANCE);
}
@@ -1714,7 +1713,6 @@ 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();
}
if (local_err) {
diff --git a/migration/options.c b/migration/options.c
index e46d847de2..ecb34a3bbd 100644
--- a/migration/options.c
+++ b/migration/options.c
@@ -622,26 +622,6 @@ bool migrate_caps_check(bool *old_caps, bool *new_caps,
Error **errp)
return true;
}
-bool migrate_cap_set(int cap, bool value, Error **errp)
-{
- MigrationState *s = migrate_get_current();
- bool new_caps[MIGRATION_CAPABILITY__MAX];
-
- if (migration_is_running(s->state)) {
- error_setg(errp, QERR_MIGRATION_ACTIVE);
- return false;
- }
-
- memcpy(new_caps, s->capabilities, sizeof(new_caps));
- new_caps[cap] = value;
-
- if (!migrate_caps_check(s->capabilities, new_caps, errp)) {
- return false;
- }
- s->capabilities[cap] = value;
- return true;
-}
-
MigrationCapabilityStatusList *qmp_query_migrate_capabilities(Error **errp)
{
MigrationCapabilityStatusList *head = NULL, **tail = &head;
@@ -861,29 +841,8 @@ 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 */
-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);
- migrate_set_block_incremental(false);
- s->must_remove_block_options = false;
- }
-}
-
AnnounceParameters *migrate_announce_params(void)
{
static AnnounceParameters ap;
--
2.41.0
