[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH v4 06/11] savevm: add error parameter to qemu_savevm
From: |
Pavel Hrdina |
Subject: |
[Qemu-devel] [PATCH v4 06/11] savevm: add error parameter to qemu_savevm_state() |
Date: |
Fri, 29 Mar 2013 15:12:33 +0100 |
Signed-off-by: Pavel Hrdina <address@hidden>
Reviewed-by: Eric Blake <address@hidden>
---
savevm.c | 12 ++++++------
1 file changed, 6 insertions(+), 6 deletions(-)
diff --git a/savevm.c b/savevm.c
index 7598934..3c1ac9e 100644
--- a/savevm.c
+++ b/savevm.c
@@ -1910,7 +1910,7 @@ void qemu_savevm_state_cancel(void)
}
}
-static int qemu_savevm_state(QEMUFile *f)
+static int qemu_savevm_state(QEMUFile *f, Error **errp)
{
int ret;
MigrationParams params = {
@@ -1918,23 +1918,23 @@ static int qemu_savevm_state(QEMUFile *f)
.shared = 0
};
- if (qemu_savevm_state_blocked(NULL)) {
+ if (qemu_savevm_state_blocked(errp)) {
return -EINVAL;
}
qemu_mutex_unlock_iothread();
- qemu_savevm_state_begin(f, ¶ms, NULL);
+ qemu_savevm_state_begin(f, ¶ms, errp);
qemu_mutex_lock_iothread();
while (qemu_file_get_error(f) == 0) {
- if (qemu_savevm_state_iterate(f, NULL) > 0) {
+ if (qemu_savevm_state_iterate(f, errp) > 0) {
break;
}
}
ret = qemu_file_get_error(f);
if (ret == 0) {
- qemu_savevm_state_complete(f, NULL);
+ qemu_savevm_state_complete(f, errp);
ret = qemu_file_get_error(f);
}
if (ret != 0) {
@@ -2321,7 +2321,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.4
- [Qemu-devel] [PATCH v4 00/11] convert savevm to use qapi and introduce qmp command, Pavel Hrdina, 2013/03/29
- [Qemu-devel] [PATCH v4 02/11] block: add error parameter to del_existing_snapshots(), Pavel Hrdina, 2013/03/29
- [Qemu-devel] [PATCH v4 03/11] savevm: add error parameter to qemu_savevm_state_begin(), Pavel Hrdina, 2013/03/29
- [Qemu-devel] [PATCH v4 01/11] block: add error parameter to bdrv_snapshot_create() and related functions, Pavel Hrdina, 2013/03/29
- [Qemu-devel] [PATCH v4 05/11] savevm: add error parameter to qemu_savevm_state_complete(), Pavel Hrdina, 2013/03/29
- [Qemu-devel] [PATCH v4 06/11] savevm: add error parameter to qemu_savevm_state(),
Pavel Hrdina <=
- [Qemu-devel] [PATCH v4 04/11] savevm: add error parameter to qemu_savevm_state_iterate(), Pavel Hrdina, 2013/03/29
- [Qemu-devel] [PATCH v4 08/11] qemu-img: introduce qemu_img_handle_error, Pavel Hrdina, 2013/03/29
- [Qemu-devel] [PATCH v4 07/11] qapi: Convert savevm, Pavel Hrdina, 2013/03/29
- [Qemu-devel] [PATCH v4 10/11] savevm: update return value from qemu_savevm_state, Pavel Hrdina, 2013/03/29
- [Qemu-devel] [PATCH v4 09/11] block: update return value from bdrv_snapshot_create, Pavel Hrdina, 2013/03/29
- [Qemu-devel] [PATCH v4 11/11] savevm: add force parameter to HMP command and return snapshot info, Pavel Hrdina, 2013/03/29