On Thu, Jul 17, 2025 at 06:07:42AM +0530, Arun Menon wrote:
> This is an incremental step in converting vmstate loading
> code to report error via Error objects instead of directly
> printing it to console/monitor.
> It is ensured that qemu_loadvm_state() must report an error
> in errp, in case of failure.
>
> Signed-off-by: Arun Menon <arme...@redhat.com>
> ---
> migration/migration.c | 5 +++--
> migration/savevm.c | 25 +++++++++++++------------
> migration/savevm.h | 2 +-
> 3 files changed, 17 insertions(+), 15 deletions(-)
> @@ -3181,8 +3178,12 @@ int qemu_loadvm_state(QEMUFile *f)
> if (migrate_has_error(migrate_get_current()) ||
> !qemu_loadvm_thread_pool_wait(s, mis)) {
> ret = -EINVAL;
> + error_setg(errp, "Error while loading vmstate : %d", ret);
> } else {
> ret = qemu_file_get_error(f);
> + if (ret < 0) {
> + error_setg(errp, "Error while loading vmstate : %d", ret);
> + }
Replace qemu_file_get_error with qemu_file_get_error_obj(..., errp)
so we propagate the real error message.
With regards,
Daniel
--
|: https://berrange.com -o- https://www.flickr.com/photos/dberrange :|
|: https://libvirt.org -o- https://fstop138.berrange.com :|
|: https://entangle-photo.org -o- https://www.instagram.com/dberrange :|
