[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
Re: [PATCH 02/33] migration: push Error **errp into qemu_loadvm_state_he
From: |
Philippe Mathieu-Daudé |
Subject: |
Re: [PATCH 02/33] migration: push Error **errp into qemu_loadvm_state_header() |
Date: |
Thu, 4 Feb 2021 22:58:58 +0100 |
User-agent: |
Mozilla/5.0 (X11; Linux x86_64; rv:78.0) Gecko/20100101 Thunderbird/78.6.0 |
On 2/4/21 6:18 PM, Daniel P. Berrangé wrote:
> This is an incremental step in converting vmstate loading code to report
> via Error objects instead of printing directly to the console/monitor.
>
> Signed-off-by: Daniel P. Berrangé <berrange@redhat.com>
> ---
> migration/savevm.c | 31 +++++++++++++++++--------------
> 1 file changed, 17 insertions(+), 14 deletions(-)
...
> if (migrate_get_current()->send_configuration) {
> - if (qemu_get_byte(f) != QEMU_VM_CONFIGURATION) {
> - error_report("Configuration section missing");
> + v = qemu_get_byte(f);
> + if (v != QEMU_VM_CONFIGURATION) {
> + error_setg(errp, "Configuration section missing, %x != %x",
> + v, QEMU_VM_CONFIGURATION);
> qemu_loadvm_state_cleanup();
> - return -EINVAL;
> + return -1;
> }
> ret = vmstate_load_state(f, &vmstate_configuration, &savevm_state,
> 0);
>
> if (ret) {
> + error_setg(errp, "Error %d while loading VM state", ret);
error_setg_errno(), otherwise:
Reviewed-by: Philippe Mathieu-Daudé <philmd@redhat.com>
> qemu_loadvm_state_cleanup();
> - return ret;
> + return -1;
> }
> }
> return 0;
- [PATCH 00/33] migration: capture error reports into Error object, Daniel P . Berrangé, 2021/02/04
- [PATCH 02/33] migration: push Error **errp into qemu_loadvm_state_header(), Daniel P . Berrangé, 2021/02/04
- Re: [PATCH 02/33] migration: push Error **errp into qemu_loadvm_state_header(),
Philippe Mathieu-Daudé <=
- [PATCH 04/33] migration: push Error **errp into qemu_load_device_state(), Daniel P . Berrangé, 2021/02/04
- [PATCH 07/33] migration: push Error **errp into qemu_loadvm_section_part_end(), Daniel P . Berrangé, 2021/02/04
- [PATCH 09/33] migration: push Error **errp into loadvm_handle_cmd_packaged(), Daniel P . Berrangé, 2021/02/04
- [PATCH 03/33] migration: push Error **errp into qemu_loadvm_state_setup(), Daniel P . Berrangé, 2021/02/04
- [PATCH 05/33] migration: push Error **errp into qemu_loadvm_state_main(), Daniel P . Berrangé, 2021/02/04