On Thu, Jul 17, 2025 at 06:07:26AM +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_header() must report an error
> in errp, in case of failure.
>
> Signed-off-by: Arun Menon <arme...@redhat.com>
> ---
> migration/savevm.c | 25 ++++++++++++++++---------
> 1 file changed, 16 insertions(+), 9 deletions(-)
>
> diff --git a/migration/savevm.c b/migration/savevm.c
> index
> ab947620f724874f325fb9fb59bef50b7c16fb51..3ccbc724eb808db09b77088a858ecc7f06b21155
> 100644
> --- a/migration/savevm.c
> +++ b/migration/savevm.c
> @@ -2814,35 +2814,42 @@ qemu_loadvm_section_part_end(QEMUFile *f, uint8_t
> type)
> return 0;
> }
>
> -static int qemu_loadvm_state_header(QEMUFile *f)
> +static int qemu_loadvm_state_header(QEMUFile *f, Error **errp)
> {
> unsigned int v;
> int ret;
>
> v = qemu_get_be32(f);
> if (v != QEMU_VM_FILE_MAGIC) {
> - error_report("Not a migration stream");
> + error_setg(errp, "Not a migration stream, "
> + "magic: %x != %x", v, QEMU_VM_FILE_MAGIC);
> return -EINVAL;
> }
>
> v = qemu_get_be32(f);
> if (v == QEMU_VM_FILE_VERSION_COMPAT) {
> - error_report("SaveVM v2 format is obsolete and don't work anymore");
> + error_setg(errp, "SaveVM v2 format is obsolete and don't "
> + "work anymore, file version %x != %x",
This is a pre-existing issue, but can be fix the tail end of the
message to say
"SaveVM v2 format is obsolete and no longer supported, file version %x != %x"
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 :|
