[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH 06/13] savevm: add error parameter to qemu_savevm_st
From: |
Pavel Hrdina |
Subject: |
[Qemu-devel] [PATCH 06/13] savevm: add error parameter to qemu_savevm_state() |
Date: |
Wed, 9 Jan 2013 16:18:00 +0100 |
Signed-off-by: Pavel Hrdina <address@hidden>
---
savevm.c | 15 +++++++++------
1 file changed, 9 insertions(+), 6 deletions(-)
diff --git a/savevm.c b/savevm.c
index 14f61e9..b705693 100644
--- a/savevm.c
+++ b/savevm.c
@@ -1759,7 +1759,7 @@ void qemu_savevm_state_cancel(QEMUFile *f)
}
}
-static int qemu_savevm_state(QEMUFile *f)
+static int qemu_savevm_state(QEMUFile *f, Error **errp)
{
int ret;
MigrationParams params = {
@@ -1767,26 +1767,29 @@ static int qemu_savevm_state(QEMUFile *f)
.shared = 0
};
- if (qemu_savevm_state_blocked(NULL)) {
+ if (qemu_savevm_state_blocked(errp)) {
ret = -EINVAL;
goto out;
}
- ret = qemu_savevm_state_begin(f, ¶ms, NULL);
+ ret = qemu_savevm_state_begin(f, ¶ms, errp);
if (ret < 0)
goto out;
do {
- ret = qemu_savevm_state_iterate(f, NULL);
+ ret = qemu_savevm_state_iterate(f, errp);
if (ret < 0)
goto out;
} while (ret == 0);
- ret = qemu_savevm_state_complete(f, NULL);
+ ret = qemu_savevm_state_complete(f, errp);
out:
if (ret == 0) {
ret = qemu_file_get_error(f);
+ if (ret < 0) {
+ error_setg_errno(errp, errno, "Failed to create vmstate.");
+ }
}
return ret;
@@ -2187,7 +2190,7 @@ void do_savevm(Monitor *mon, const QDict *qdict)
monitor_printf(mon, "Could not open VM state file\n");
goto the_end;
}
- ret = qemu_savevm_state(f);
+ ret = qemu_savevm_state(f, NULL);
vm_state_size = qemu_ftell(f);
qemu_fclose(f);
if (ret < 0) {
--
1.8.1
- [Qemu-devel] [PATCH 03/13] savevm: add error parameter to qemu_savevm_state_begin(), (continued)
- [Qemu-devel] [PATCH 03/13] savevm: add error parameter to qemu_savevm_state_begin(), Pavel Hrdina, 2013/01/09
- [Qemu-devel] [PATCH 02/13] block: add error parameter to del_existing_snapshots(), Pavel Hrdina, 2013/01/09
- [Qemu-devel] [PATCH 04/13] savevm: add error parameter to qemu_savevm_state_iterate(), Pavel Hrdina, 2013/01/09
- [Qemu-devel] [PATCH 05/13] savevm: add error parameter to qemu_savevm_state_complete(), Pavel Hrdina, 2013/01/09
- [Qemu-devel] [PATCH 07/13] qapi: Convert savevm, Pavel Hrdina, 2013/01/09
- [Qemu-devel] [PATCH 10/13] savevm: update return value from qemu_savevm_state_begin, Pavel Hrdina, 2013/01/09
- [Qemu-devel] [PATCH 08/13] qemu-img: introduce qemu_img_handle_error, Pavel Hrdina, 2013/01/09
- [Qemu-devel] [PATCH 09/13] block: update return value from bdrv_snapshot_create, Pavel Hrdina, 2013/01/09
- [Qemu-devel] [PATCH 06/13] savevm: add error parameter to qemu_savevm_state(),
Pavel Hrdina <=
- [Qemu-devel] [PATCH 11/13] savevm: update return value from qemu_savevm_state_complete, Pavel Hrdina, 2013/01/09
- [Qemu-devel] [PATCH 12/13] savevm: update return value from qemu_savevm_state, Pavel Hrdina, 2013/01/09
- [Qemu-devel] [PATCH 13/13] vm-snapshot-save: add force parameter, Pavel Hrdina, 2013/01/09
- Re: [Qemu-devel] [PATCH 00/13] convert savevm to use qapi and introduce qmp command, Pavel Hrdina, 2013/01/09