diff options
| author | Peter Xu <peterx@redhat.com> | 2023-10-17 16:26:29 -0400 |
|---|---|---|
| committer | Juan Quintela <quintela@redhat.com> | 2023-11-02 11:35:03 +0100 |
| commit | 7aa6070d09c5a6c83490599a3c564c64d7e2520a (patch) | |
| tree | b9173cb1f3f58a8fc624cb9605494311f7d055db /migration/qemu-file.h | |
| parent | e7b428d6bc06a0dfffa7e47fb3b3ee47f1c93499 (diff) | |
| download | focaccia-qemu-7aa6070d09c5a6c83490599a3c564c64d7e2520a.tar.gz focaccia-qemu-7aa6070d09c5a6c83490599a3c564c64d7e2520a.zip | |
migration: Refactor error handling in source return path
rp_state.error was a boolean used to show error happened in return path
thread. That's not only duplicating error reporting (migrate_set_error),
but also not good enough in that we only do error_report() and set it to
true, we never can keep a history of the exact error and show it in
query-migrate.
To make this better, a few things done:
- Use error_setg() rather than error_report() across the whole lifecycle
of return path thread, keeping the error in an Error*.
- With above, no need to have mark_source_rp_bad(), remove it, alongside
with rp_state.error itself.
- Use migrate_set_error() to apply that captured error to the global
migration object when error occured in this thread.
- Do the same when detected qemufile error in source return path
We need to re-export qemu_file_get_error_obj() to do the last one.
Signed-off-by: Peter Xu <peterx@redhat.com>
Reviewed-by: Fabiano Rosas <farosas@suse.de>
Reviewed-by: Juan Quintela <quintela@redhat.com>
Signed-off-by: Juan Quintela <quintela@redhat.com>
Message-ID: <20231017202633.296756-2-peterx@redhat.com>
Diffstat (limited to 'migration/qemu-file.h')
| -rw-r--r-- | migration/qemu-file.h | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/migration/qemu-file.h b/migration/qemu-file.h index 1774116f79..8aec9fabf7 100644 --- a/migration/qemu-file.h +++ b/migration/qemu-file.h @@ -68,6 +68,7 @@ int coroutine_mixed_fn qemu_peek_byte(QEMUFile *f, int offset); void qemu_file_skip(QEMUFile *f, int size); int qemu_file_get_error_obj_any(QEMUFile *f1, QEMUFile *f2, Error **errp); void qemu_file_set_error_obj(QEMUFile *f, int ret, Error *err); +int qemu_file_get_error_obj(QEMUFile *f, Error **errp); void qemu_file_set_error(QEMUFile *f, int ret); int qemu_file_shutdown(QEMUFile *f); QEMUFile *qemu_file_get_return_path(QEMUFile *f); |