On Thu, Jul 17, 2025 at 06:07:29AM +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_section_part_end() must report an error
> in errp, in case of failure.
>
> Signed-off-by: Arun Menon <arme...@redhat.com>
> ---
> migration/savevm.c | 17 +++++++++--------
> 1 file changed, 9 insertions(+), 8 deletions(-)
>
> diff --git a/migration/savevm.c b/migration/savevm.c
> index
> 63125971751394b72efc9bcaf7c4364715eef07f..22d73999595384519c755c9416b74ba1263a8bb9
> 100644
> --- a/migration/savevm.c
> +++ b/migration/savevm.c
> @@ -2764,7 +2764,7 @@ qemu_loadvm_section_start_full(QEMUFile *f, uint8_t
> type, Error **errp)
> }
>
> static int
> -qemu_loadvm_section_part_end(QEMUFile *f, uint8_t type)
> +qemu_loadvm_section_part_end(QEMUFile *f, uint8_t type, Error **errp)
> {
> bool trace_downtime = (type == QEMU_VM_SECTION_END);
> int64_t start_ts, end_ts;
> @@ -2776,8 +2776,8 @@ qemu_loadvm_section_part_end(QEMUFile *f, uint8_t type)
>
> ret = qemu_file_get_error(f);
> if (ret) {
> - error_report("%s: Failed to read section ID: %d",
> - __func__, ret);
> + error_setg(errp, "%s: Failed to read section ID: %d",
> + __func__, ret);
Same note about dropping __func__
> @@ -2810,6 +2810,7 @@ qemu_loadvm_section_part_end(QEMUFile *f, uint8_t type)
> }
>
> if (!check_section_footer(f, se)) {
> + error_setg(errp, "Check section footer error");
Include "section_id" as that's the only context we have available.
> return -EINVAL;
> }
>
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 :|
