[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH v2 10/17] savevm: add error parameter to qemu_savevm
From: |
Pavel Hrdina |
Subject: |
[Qemu-devel] [PATCH v2 10/17] savevm: add error parameter to qemu_savevm_state_complete() |
Date: |
Thu, 13 Dec 2012 16:40:44 +0100 |
Signed-off-by: Pavel Hrdina <address@hidden>
---
migration.c | 2 +-
savevm.c | 13 ++++++++++---
sysemu.h | 3 ++-
3 files changed, 13 insertions(+), 5 deletions(-)
diff --git a/migration.c b/migration.c
index bbc0cac..3ae1db0 100644
--- a/migration.c
+++ b/migration.c
@@ -353,7 +353,7 @@ void migrate_fd_put_ready(MigrationState *s)
qemu_system_wakeup_request(QEMU_WAKEUP_REASON_OTHER);
vm_stop_force_state(RUN_STATE_FINISH_MIGRATE);
- if (qemu_savevm_state_complete(s->file) < 0) {
+ if (qemu_savevm_state_complete(s->file, NULL) < 0) {
migrate_fd_error(s);
} else {
migrate_fd_completed(s);
diff --git a/savevm.c b/savevm.c
index 26f12e1..c17cc7f 100644
--- a/savevm.c
+++ b/savevm.c
@@ -1713,7 +1713,8 @@ int qemu_savevm_state_iterate(QEMUFile *f,
return ret;
}
-int qemu_savevm_state_complete(QEMUFile *f)
+int qemu_savevm_state_complete(QEMUFile *f,
+ Error **errp)
{
SaveStateEntry *se;
int ret;
@@ -1737,6 +1738,7 @@ int qemu_savevm_state_complete(QEMUFile *f)
ret = se->ops->save_live_complete(f, se->opaque);
trace_savevm_section_end(se->section_id);
if (ret < 0) {
+ error_setg(errp, "Failed to complete vmstate save.");
return ret;
}
}
@@ -1766,7 +1768,12 @@ int qemu_savevm_state_complete(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(errp, "%s", strerror(errno));
+ }
+
+ return ret;
}
void qemu_savevm_state_cancel(QEMUFile *f)
@@ -1803,7 +1810,7 @@ static int qemu_savevm_state(QEMUFile *f)
goto out;
} while (ret == 0);
- ret = qemu_savevm_state_complete(f);
+ ret = qemu_savevm_state_complete(f, NULL);
out:
if (ret == 0) {
diff --git a/sysemu.h b/sysemu.h
index d0530b2..11a4560 100644
--- a/sysemu.h
+++ b/sysemu.h
@@ -78,7 +78,8 @@ int qemu_savevm_state_begin(QEMUFile *f,
Error **errp);
int qemu_savevm_state_iterate(QEMUFile *f,
Error **errp);
-int qemu_savevm_state_complete(QEMUFile *f);
+int qemu_savevm_state_complete(QEMUFile *f,
+ Error **errp);
void qemu_savevm_state_cancel(QEMUFile *f);
int qemu_loadvm_state(QEMUFile *f);
--
1.8.0.2
- [Qemu-devel] [PATCH v2 06/17] block: add error parameter to bdrv_snapshot_find(), (continued)
- [Qemu-devel] [PATCH v2 06/17] block: add error parameter to bdrv_snapshot_find(), Pavel Hrdina, 2012/12/13
- [Qemu-devel] [PATCH v2 05/17] block: add error parameter to bdrv_snapshot_list() and related functions, Pavel Hrdina, 2012/12/13
- [Qemu-devel] [PATCH v2 04/17] block: add error parameter to bdrv_snapshot_delete() and related functions, Pavel Hrdina, 2012/12/13
- [Qemu-devel] [PATCH v2 09/17] savevm: add error parameter to qemu_savevm_state_iterate(), Pavel Hrdina, 2012/12/13
- [Qemu-devel] [PATCH v2 16/17] qapi: Convert info snapshots, Pavel Hrdina, 2012/12/13
- [Qemu-devel] [PATCH v2 11/17] savevm: add error parameter to qemu_savevm_state(), Pavel Hrdina, 2012/12/13
- [Qemu-devel] [PATCH v2 13/17] qapi: Convert savevm, Pavel Hrdina, 2012/12/13
- [Qemu-devel] [PATCH v2 10/17] savevm: add error parameter to qemu_savevm_state_complete(),
Pavel Hrdina <=
- [Qemu-devel] [PATCH v2 17/17] vm-snapshot-save: add force parameter, Pavel Hrdina, 2012/12/13
- [Qemu-devel] [PATCH v2 14/17] qapi: Convert loadvm, Pavel Hrdina, 2012/12/13
- [Qemu-devel] [PATCH v2 15/17] qapi: Convert delvm, Pavel Hrdina, 2012/12/13
- Re: [Qemu-devel] [PATCH v2 00/17] qapi: Convert savevm, loadvm, delvm and info snapshots, Luiz Capitulino, 2012/12/14
- Re: [Qemu-devel] [PATCH v2 00/17] qapi: Convert savevm, loadvm, delvm and info snapshots, Wenchao Xia, 2012/12/19