diff options
| author | Fabiano Rosas <farosas@suse.de> | 2025-02-05 13:23:55 -0300 |
|---|---|---|
| committer | Fabiano Rosas <farosas@suse.de> | 2025-02-14 15:19:04 -0300 |
| commit | e0ad300fe1a0e0b12b90994bab6e4df77dd1ee8a (patch) | |
| tree | c3671a94999710d69473a4c671949438fe0d9a9f /migration/savevm.c | |
| parent | 9b3b192f65b1cf635719a2981dd2d4b70892d2ec (diff) | |
| download | focaccia-qemu-e0ad300fe1a0e0b12b90994bab6e4df77dd1ee8a.tar.gz focaccia-qemu-e0ad300fe1a0e0b12b90994bab6e4df77dd1ee8a.zip | |
migration: Check migration error after loadvm
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. Reviewed-by: Peter Xu <peterx@redhat.com> Signed-off-by: Fabiano Rosas <farosas@suse.de>
Diffstat (limited to 'migration/savevm.c')
| -rw-r--r-- | migration/savevm.c | 6 |
1 files changed, 5 insertions, 1 deletions
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); + } } /* |