fridtjof/qemu-cr16
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

migration: Update qemu_file_get_return_path() docs and remove dead checks

Browse source 
The documentation of qemu_file_get_return_path() states that it can
return NULL on failure. However, a review of the current implementation
reveals that it is guaranteed that it will always succeed and will never
return NULL.

As a result, the NULL checks post calling the function become redundant.
This commit updates the documentation for the function and removes all
NULL checks throughout the migration code.

Reviewed-by: Daniel P. Berrangé <berrange@redhat.com>
Reviewed-by: Marc-André Lureau <marcandre.lureau@redhat.com>
Reviewed-by: Fabiano Rosas <farosas@suse.de>
Signed-off-by: Arun Menon <armenon@redhat.com>
Tested-by: Fabiano Rosas <farosas@suse.de>
Reviewed-by: Akihiko Odaki <odaki@rsg.ci.i.u-tokyo.ac.jp>
Link: https://lore.kernel.org/r/20250918-propagate_tpm_error-v14-12-36f11a6fb9d3@redhat.com
Signed-off-by: Peter Xu <peterx@redhat.com>
This commit is contained in:
Arun Menon 2025-09-18 20:53:29 +05:30 • committed by Peter Xu
parent 8b6dad124b
commit 3f9d6e77b0
4 changed files with 2 additions and 19 deletions
Download patch file Download diff file Expand all files Collapse all files

4
migration/colo.c
View file

@ -847,10 +847,6 @@ static void *colo_process_incoming_thread(void *opaque)
failover_init_state(); failover_init_state();
mis->to_src_file = qemu_file_get_return_path(mis->from_src_file); mis->to_src_file = qemu_file_get_return_path(mis->from_src_file);
if (!mis->to_src_file) {
error_report("COLO incoming thread: Open QEMUFile to_src_file failed");
goto out;
}
/* /*
* Note: the communication between Primary side and Secondary side * Note: the communication between Primary side and Secondary side
* should be sequential, we set the fd to unblocked in migration incoming * should be sequential, we set the fd to unblocked in migration incoming

12
migration/migration.c
View file

@ -2656,12 +2656,9 @@ out:
return NULL; return NULL;
} }
static int open_return_path_on_source(MigrationState *ms) static void open_return_path_on_source(MigrationState *ms)
{ {
ms->rp_state.from_dst_file = qemu_file_get_return_path(ms->to_dst_file); ms->rp_state.from_dst_file = qemu_file_get_return_path(ms->to_dst_file);
if (!ms->rp_state.from_dst_file) {
return -1;
}
trace_open_return_path_on_source(); trace_open_return_path_on_source();
@ -2670,8 +2667,6 @@ static int open_return_path_on_source(MigrationState *ms)
ms->rp_state.rp_thread_created = true; ms->rp_state.rp_thread_created = true;
trace_open_return_path_on_source_continue(); trace_open_return_path_on_source_continue();
return 0;
} }
/* Return true if error detected, or false otherwise */ /* Return true if error detected, or false otherwise */
@ -4022,10 +4017,7 @@ void migration_connect(MigrationState *s, Error *error_in)
* QEMU uses the return path. * QEMU uses the return path.
*/ */
if (migrate_postcopy_ram() || migrate_return_path()) { if (migrate_postcopy_ram() || migrate_return_path()) {
if (open_return_path_on_source(s)) { open_return_path_on_source(s);
error_setg(&local_err, "Unable to open return-path for postcopy");
goto fail;
}
} }
/* /*

1
migration/qemu-file.c
View file

@ -125,7 +125,6 @@ static QEMUFile *qemu_file_new_impl(QIOChannel *ioc, bool is_writable)
/* /*
* Result: QEMUFile* for a 'return path' for comms in the opposite direction * Result: QEMUFile* for a 'return path' for comms in the opposite direction
* NULL if not available
*/ */
QEMUFile *qemu_file_get_return_path(QEMUFile *f) QEMUFile *qemu_file_get_return_path(QEMUFile *f)
{ {

4
migration/savevm.c
View file

@ -2588,10 +2588,6 @@ static int loadvm_process_command(QEMUFile *f, Error **errp)
return 0; return 0;
} }
mis->to_src_file = qemu_file_get_return_path(f); mis->to_src_file = qemu_file_get_return_path(f);
if (!mis->to_src_file) {
error_setg(errp, "CMD_OPEN_RETURN_PATH failed");
return -1;
}
/* /*
* Switchover ack is enabled but no device uses it, so send an ACK to * Switchover ack is enabled but no device uses it, so send an ACK to