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é <berra...@redhat.com>
---
migration/migration.c | 14 +++++++++++---
migration/savevm.c | 18 +++++++++++-------
migration/savevm.h | 3 ++-
3 files changed, 24 insertions(+), 11 deletions(-)
diff --git a/migration/migration.c b/migration/migration.c
index e814d47796..2ccb1b66b5 100644
--- a/migration/migration.c
+++ b/migration/migration.c
@@ -2845,7 +2845,11 @@ static int postcopy_start(MigrationState *ms)
* Cause any non-postcopiable, but iterative devices to
* send out their final data.
*/
- qemu_savevm_state_complete_precopy(ms->to_dst_file, true, false);
+ if (qemu_savevm_state_complete_precopy(ms->to_dst_file, true, false,
+ &local_err) < 0) {
+ error_report_err(local_err);
+ goto fail;
+ }
/*
* in Finish migrate and with the io-lock held everything should
@@ -2898,7 +2902,10 @@ static int postcopy_start(MigrationState *ms)
*/
qemu_savevm_send_postcopy_listen(fb);
- qemu_savevm_state_complete_precopy(fb, false, false);
+ if (qemu_savevm_state_complete_precopy(fb, false, false, &local_err) < 0) {
+ error_report_err(local_err);
+ goto fail_closefb;
+ }
if (migrate_postcopy_ram()) {
qemu_savevm_send_ping(fb, 3);
}
@@ -3049,7 +3056,8 @@ static void migration_completion(MigrationState *s)
if (ret >= 0) {
qemu_file_set_rate_limit(s->to_dst_file, INT64_MAX);
ret = qemu_savevm_state_complete_precopy(s->to_dst_file, false,
- inactivate);
+ inactivate,
+ &local_err);
}
if (inactivate && ret >= 0) {
s->block_inactive = true;
diff --git a/migration/savevm.c b/migration/savevm.c
index 95e228a646..d6c36e6b6b 100644
--- a/migration/savevm.c
+++ b/migration/savevm.c
@@ -1441,7 +1441,8 @@ int
qemu_savevm_state_complete_precopy_non_iterable(QEMUFile *f,
}
int qemu_savevm_state_complete_precopy(QEMUFile *f, bool iterable_only,
- bool inactivate_disks)
+ bool inactivate_disks,
+ Error **errp)
{
Error *local_err = NULL;
bool in_postcopy = migration_in_postcopy();
@@ -1456,8 +1457,7 @@ int qemu_savevm_state_complete_precopy(QEMUFile *f, bool
iterable_only,
if (!in_postcopy || iterable_only) {
if (qemu_savevm_state_complete_precopy_iterable(f, in_postcopy,
- &local_err) < 0) {
- error_report_err(local_err);
+ errp) < 0) {
return -1;
}
}
@@ -1468,8 +1468,7 @@ int qemu_savevm_state_complete_precopy(QEMUFile *f, bool
iterable_only,
if (qemu_savevm_state_complete_precopy_non_iterable(f, in_postcopy,
inactivate_disks,
- &local_err) < 0) {
- error_report_err(local_err);
+ errp) < 0) {
return -1;
}
@@ -1568,7 +1567,9 @@ static int qemu_savevm_state(QEMUFile *f, Error **errp)
}
}
- qemu_savevm_state_complete_precopy(f, false, false);
+ if (qemu_savevm_state_complete_precopy(f, false, false, errp) < 0) {
+ goto fail;
+ }
ret = qemu_file_get_error(f);
if (ret != 0) {
error_setg_errno(errp, -ret, "Error while writing VM state");
@@ -1594,8 +1595,11 @@ static int qemu_savevm_state(QEMUFile *f, Error **errp)
void qemu_savevm_live_state(QEMUFile *f)
{
+ Error *local_err = NULL;
/* save QEMU_VM_SECTION_END section */
- qemu_savevm_state_complete_precopy(f, true, false);
+ if (qemu_savevm_state_complete_precopy(f, true, false, &local_err) < 0) {
+ error_report_err(local_err);
+ }
qemu_put_byte(f, QEMU_VM_EOF);
}
diff --git a/migration/savevm.h b/migration/savevm.h
index b7133655f2..e3120a4fb0 100644
--- a/migration/savevm.h
+++ b/migration/savevm.h
@@ -38,7 +38,8 @@ int qemu_savevm_state_iterate(QEMUFile *f, bool postcopy,
Error **errp);
void qemu_savevm_state_cleanup(void);
void qemu_savevm_state_complete_postcopy(QEMUFile *f);
int qemu_savevm_state_complete_precopy(QEMUFile *f, bool iterable_only,
- bool inactivate_disks);
+ bool inactivate_disks,
+ Error **errp);
void qemu_savevm_state_pending(QEMUFile *f, uint64_t max_size,
uint64_t *res_precopy_only,
uint64_t *res_compatible,
--
2.29.2
