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/colo.c | 2 +-
migration/savevm.c | 51 ++++++++++++++++++++++++++++------------------
migration/savevm.h | 2 +-
3 files changed, 33 insertions(+), 22 deletions(-)
diff --git a/migration/colo.c b/migration/colo.c
index a76b72c984..fc824a9732 100644
--- a/migration/colo.c
+++ b/migration/colo.c
@@ -459,7 +459,7 @@ static int colo_do_checkpoint_transaction(MigrationState *s,
goto out;
}
/* Note: device state is saved into buffer */
- ret = qemu_save_device_state(fb);
+ ret = qemu_save_device_state(fb, &local_err);
qemu_mutex_unlock_iothread();
if (ret < 0) {
diff --git a/migration/savevm.c b/migration/savevm.c
index 884d12c6eb..994a7c7dab 100644
--- a/migration/savevm.c
+++ b/migration/savevm.c
@@ -1604,9 +1604,10 @@ int qemu_savevm_live_state(QEMUFile *f, Error **errp)
return 0;
}
-int qemu_save_device_state(QEMUFile *f)
+int qemu_save_device_state(QEMUFile *f, Error **errp)
{
SaveStateEntry *se;
+ int ret;
if (!migration_in_colo_state()) {
qemu_put_be32(f, QEMU_VM_FILE_MAGIC);
@@ -1615,7 +1616,6 @@ int qemu_save_device_state(QEMUFile *f)
cpu_synchronize_all_states();
QTAILQ_FOREACH(se, &savevm_state.handlers, entry) {
- int ret;
if (se->is_ram) {
continue;
@@ -1630,8 +1630,9 @@ int qemu_save_device_state(QEMUFile *f)
save_section_header(f, se, QEMU_VM_SECTION_FULL);
ret = vmstate_save(f, se, NULL);
- if (ret) {
- return ret;
+ if (ret < 0) {
+ error_setg_errno(errp, -ret, "failed to save device state");
+ return -1;
}
save_section_footer(f, se);
@@ -1639,7 +1640,12 @@ int qemu_save_device_state(QEMUFile *f)
qemu_put_byte(f, QEMU_VM_EOF);
- return qemu_file_get_error(f);
+ ret = qemu_file_get_error(f);
+ if (ret < 0) {
+ error_setg_errno(errp, -ret, "I/O error saving device state");
+ return -1;
+ }
+ return 0;
}
static SaveStateEntry *find_se(const char *idstr, uint32_t instance_id)
@@ -2959,22 +2965,27 @@ void qmp_xen_save_devices_state(const char *filename,
bool has_live, bool live,
qio_channel_set_name(QIO_CHANNEL(ioc), "migration-xen-save-state");
f = qemu_fopen_channel_output(QIO_CHANNEL(ioc));
object_unref(OBJECT(ioc));
- ret = qemu_save_device_state(f);
- if (ret < 0 || qemu_fclose(f) < 0) {
+ ret = qemu_save_device_state(f, errp);
+ if (ret < 0) {
+ goto the_end;
+ }
+
+ if (qemu_fclose(f) < 0) {
error_setg(errp, QERR_IO_ERROR);
- } else {
- /* libxl calls the QMP command "stop" before calling
- * "xen-save-devices-state" and in case of migration failure, libxl
- * would call "cont".
- * So call bdrv_inactivate_all (release locks) here to let the other
- * side of the migration take control of the images.
- */
- if (live && !saved_vm_running) {
- ret = bdrv_inactivate_all();
- if (ret) {
- error_setg(errp, "%s: bdrv_inactivate_all() failed (%d)",
- __func__, ret);
- }
+ goto the_end;
+ }
+
+ /* libxl calls the QMP command "stop" before calling
+ * "xen-save-devices-state" and in case of migration failure, libxl
+ * would call "cont".
+ * So call bdrv_inactivate_all (release locks) here to let the other
+ * side of the migration take control of the images.
+ */
+ if (live && !saved_vm_running) {
+ ret = bdrv_inactivate_all();
+ if (ret) {
+ error_setg(errp, "%s: bdrv_inactivate_all() failed (%d)",
+ __func__, ret);
}
}
diff --git a/migration/savevm.h b/migration/savevm.h
index 7abd75b668..a91e097b51 100644
--- a/migration/savevm.h
+++ b/migration/savevm.h
@@ -60,7 +60,7 @@ void qemu_savevm_send_postcopy_ram_discard(QEMUFile *f, const
char *name,
uint64_t *length_list);
void qemu_savevm_send_colo_enable(QEMUFile *f);
int qemu_savevm_live_state(QEMUFile *f, Error **errp);
-int qemu_save_device_state(QEMUFile *f);
+int qemu_save_device_state(QEMUFile *f, Error **errp);
int qemu_loadvm_state(QEMUFile *f, Error **errp);
void qemu_loadvm_state_cleanup(void);
--
2.29.2
