[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PATCH 07/33] migration: push Error **errp into qemu_loadvm_section_part
From: |
Daniel P . Berrangé |
Subject: |
[PATCH 07/33] migration: push Error **errp into qemu_loadvm_section_part_end() |
Date: |
Thu, 4 Feb 2021 17:18:41 +0000 |
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 | 26 +++++++++++++-------------
1 file changed, 13 insertions(+), 13 deletions(-)
diff --git a/migration/savevm.c b/migration/savevm.c
index f2eee0a4a7..350d5a315a 100644
--- a/migration/savevm.c
+++ b/migration/savevm.c
@@ -2417,7 +2417,8 @@ qemu_loadvm_section_start_full(QEMUFile *f,
MigrationIncomingState *mis,
}
static int
-qemu_loadvm_section_part_end(QEMUFile *f, MigrationIncomingState *mis)
+qemu_loadvm_section_part_end(QEMUFile *f, MigrationIncomingState *mis,
+ Error **errp)
{
uint32_t section_id;
SaveStateEntry *se;
@@ -2427,9 +2428,9 @@ qemu_loadvm_section_part_end(QEMUFile *f,
MigrationIncomingState *mis)
ret = qemu_file_get_error(f);
if (ret) {
- error_report("%s: Failed to read section ID: %d",
- __func__, ret);
- return ret;
+ error_setg(errp, "failed to read device state section end ID: %d",
+ ret);
+ return -1;
}
trace_qemu_loadvm_state_section_partend(section_id);
@@ -2439,18 +2440,19 @@ qemu_loadvm_section_part_end(QEMUFile *f,
MigrationIncomingState *mis)
}
}
if (se == NULL) {
- error_report("Unknown savevm section %d", section_id);
- return -EINVAL;
+ error_setg(errp, "unknown savevm section %d", section_id);
+ return -1;
}
ret = vmstate_load(f, se);
if (ret < 0) {
- error_report("error while loading state section id %d(%s)",
- section_id, se->idstr);
- return ret;
+ error_setg(errp, "error while loading state section id %d(%s)",
+ section_id, se->idstr);
+ return -1;
}
if (!check_section_footer(f, se)) {
- return -EINVAL;
+ error_setg(errp, "failed check for device state section footer");
+ return -1;
}
return 0;
@@ -2610,10 +2612,8 @@ retry:
break;
case QEMU_VM_SECTION_PART:
case QEMU_VM_SECTION_END:
- ret = qemu_loadvm_section_part_end(f, mis);
+ ret = qemu_loadvm_section_part_end(f, mis, errp);
if (ret < 0) {
- error_setg(errp,
- "Failed to load device state section end: %d", ret);
goto out;
}
break;
--
2.29.2
- [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
- [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é <=
- [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
- [PATCH 06/33] migration: push Error **errp into qemu_loadvm_section_start_full(), Daniel P . Berrangé, 2021/02/04