[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH v2 11/17] savevm: add error parameter to qemu_savevm
From: |
Pavel Hrdina |
Subject: |
[Qemu-devel] [PATCH v2 11/17] savevm: add error parameter to qemu_savevm_state() |
Date: |
Thu, 13 Dec 2012 16:40:45 +0100 |
Signed-off-by: Pavel Hrdina <address@hidden>
---
savevm.c | 19 +++++++++++--------
1 file changed, 11 insertions(+), 8 deletions(-)
diff --git a/savevm.c b/savevm.c
index c17cc7f..71c7df8 100644
--- a/savevm.c
+++ b/savevm.c
@@ -1787,7 +1787,8 @@ 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 = {
@@ -1795,22 +1796,24 @@ 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);
- if (ret < 0)
+ ret = qemu_savevm_state_begin(f, ¶ms, errp);
+ if (ret < 0) {
goto out;
+ }
do {
- ret = qemu_savevm_state_iterate(f, NULL);
- if (ret < 0)
+ 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) {
@@ -2217,7 +2220,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.0.2
- Re: [Qemu-devel] [PATCH v2 02/17] block: add error parameter to bdrv_snapshot_create() and related functions, (continued)
- [Qemu-devel] [PATCH v2 12/17] savevm: add error parameter to qemu_loadvm_state(), Pavel Hrdina, 2012/12/13
- [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 <=
- [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, 2012/12/13
- [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