aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTejus GK <tejus.gk@nutanix.com>2023-06-21 13:09:40 +0000
committerJuan Quintela <quintela@redhat.com>2023-09-29 17:05:23 +0200
commitf4e1b613362e51e205081a60b94f157c16acdca3 (patch)
tree24a587d239afac36bf993b113b9a0212bea3f4a0
parent0368ace8f9eb24c5959466db352e4c4afc734954 (diff)
migration: Refactor repeated call of yank_unregister_instance
In the function qmp_migrate(), yank_unregister_instance() gets called twice which isn't required. Hence, refactoring it so that it gets called during the local_error cleanup. Reviewed-by: Daniel P. Berrangé <berrange@redhat.com> Reviewed-by: Juan Quintela <quintela@redhat.com> Acked-by: Peter Xu <peterx@redhat.com> Signed-off-by: Tejus GK <tejus.gk@nutanix.com> Message-ID: <20230621130940.178659-3-tejus.gk@nutanix.com> Signed-off-by: Juan Quintela <quintela@redhat.com>
-rw-r--r--migration/migration.c4
1 files changed, 0 insertions, 4 deletions
diff --git a/migration/migration.c b/migration/migration.c
index e2ed85b5be..6d3cf5d5cd 100644
--- a/migration/migration.c
+++ b/migration/migration.c
@@ -1703,15 +1703,11 @@ void qmp_migrate(const char *uri, bool has_blk, bool blk,
} else if (strstart(uri, "fd:", &p)) {
fd_start_outgoing_migration(s, p, &local_err);
} else {
- if (!resume_requested) {
- yank_unregister_instance(MIGRATION_YANK_INSTANCE);
- }
error_setg(&local_err, QERR_INVALID_PARAMETER_VALUE, "uri",
"a valid migration protocol");
migrate_set_state(&s->state, MIGRATION_STATUS_SETUP,
MIGRATION_STATUS_FAILED);
block_cleanup_parameters();
- return;
}
if (local_err) {