| Message ID | 20250207195359.17443-9-farosas@suse.de (mailing list archive) |
|---|---|
| State | New |
| Headers | show |
| Series | crypto,io,migration: Add support to gnutls_bye() | expand |
On Fri, Feb 07, 2025 at 04:53:59PM -0300, Fabiano Rosas wrote: > We're currently only checking the QEMUFile error after > qemu_loadvm_state(). This was causing a TLS termination error from > multifd recv threads to be ignored. > > Start checking the migration error as well to avoid missing further > errors. > > Regarding compatibility concerning the TLS termination error that was > being ignored, for QEMUs <= 9.2 - if the old QEMU is being used as > migration source - the recently added migration property > multifd-tls-clean-termination needs to be set to OFF in the > *destination* machine. > > Signed-off-by: Fabiano Rosas <farosas@suse.de> Reviewed-by: Peter Xu <peterx@redhat.com>
diff --git a/migration/savevm.c b/migration/savevm.c index bc375db282..4046faf009 100644 --- a/migration/savevm.c +++ b/migration/savevm.c @@ -2940,7 +2940,11 @@ int qemu_loadvm_state(QEMUFile *f) /* When reaching here, it must be precopy */ if (ret == 0) { - ret = qemu_file_get_error(f); + if (migrate_has_error(migrate_get_current())) { + ret = -EINVAL; + } else { + ret = qemu_file_get_error(f); + } } /*
We're currently only checking the QEMUFile error after qemu_loadvm_state(). This was causing a TLS termination error from multifd recv threads to be ignored. Start checking the migration error as well to avoid missing further errors. Regarding compatibility concerning the TLS termination error that was being ignored, for QEMUs <= 9.2 - if the old QEMU is being used as migration source - the recently added migration property multifd-tls-clean-termination needs to be set to OFF in the *destination* machine. Signed-off-by: Fabiano Rosas <farosas@suse.de> --- migration/savevm.c | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-)