From: Peter Xu Date: Tue, 27 Jan 2026 18:52:48 +0000 (-0500) Subject: migration: Cleanup error propagates in qemu_savevm_state_setup() X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=9a2faa6a1705997131b42ac697f2c2e2789d2d60;p=thirdparty%2Fqemu.git migration: Cleanup error propagates in qemu_savevm_state_setup() We did two unnecessary error propagations in qemu_savevm_state_setup(), on either propagate it to MigrationState*, or set qemufile with error. Error propagation is not needed because: - Two live migration callers ([bg_]migration_thread) will propagate error if this function returned with an error. - Save snapshot (qemu_savevm_state) doesn't need to persist error; it got returned directly from save_snapshot(). QEMUFile set error is not needed because the callers always check for errors explicitly. Signed-off-by: Peter Xu Reviewed-by: Fabiano Rosas Tested-by: Lukas Straub Link: https://lore.kernel.org/qemu-devel/20260127185254.3954634-19-peterx@redhat.com Signed-off-by: Fabiano Rosas --- diff --git a/migration/savevm.c b/migration/savevm.c index 830d8e5988..0683a103c8 100644 --- a/migration/savevm.c +++ b/migration/savevm.c @@ -1385,8 +1385,6 @@ int qemu_savevm_state_setup(QEMUFile *f, Error **errp) if (se->vmsd && se->vmsd->early_setup) { ret = vmstate_save(f, se, vmdesc, errp); if (ret) { - migrate_error_propagate(ms, error_copy(*errp)); - qemu_file_set_error(f, ret); break; } continue; @@ -1405,7 +1403,6 @@ int qemu_savevm_state_setup(QEMUFile *f, Error **errp) ret = se->ops->save_setup(f, se->opaque, errp); save_section_footer(f, se); if (ret < 0) { - qemu_file_set_error(f, ret); break; } }