[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH v4 10/11] savevm: update return value from qemu_save
From: |
Pavel Hrdina |
Subject: |
[Qemu-devel] [PATCH v4 10/11] savevm: update return value from qemu_savevm_state |
Date: |
Fri, 29 Mar 2013 15:12:37 +0100 |
Signed-off-by: Pavel Hrdina <address@hidden>
Reviewed-by: Eric Blake <address@hidden>
---
savevm.c | 9 ++++-----
1 file changed, 4 insertions(+), 5 deletions(-)
diff --git a/savevm.c b/savevm.c
index 6ac4ece..75f64d1 100644
--- a/savevm.c
+++ b/savevm.c
@@ -1910,7 +1910,7 @@ void qemu_savevm_state_cancel(void)
}
}
-static int qemu_savevm_state(QEMUFile *f, Error **errp)
+static void qemu_savevm_state(QEMUFile *f, Error **errp)
{
int ret;
MigrationParams params = {
@@ -1919,7 +1919,7 @@ static int qemu_savevm_state(QEMUFile *f, Error **errp)
};
if (qemu_savevm_state_blocked(errp)) {
- return -EINVAL;
+ return;
}
qemu_mutex_unlock_iothread();
@@ -1940,7 +1940,6 @@ static int qemu_savevm_state(QEMUFile *f, Error **errp)
if (ret != 0) {
qemu_savevm_state_cancel();
}
- return ret;
}
static int qemu_save_device_state(QEMUFile *f)
@@ -2327,10 +2326,10 @@ SnapshotInfo *qmp_vm_snapshot_save(bool has_name, const
char *name,
error_setg(errp, "failed to open '%s' file", bdrv_get_device_name(bs));
goto the_end;
}
- ret = qemu_savevm_state(f, &local_err);
+ qemu_savevm_state(f, &local_err);
vm_state_size = qemu_ftell(f);
qemu_fclose(f);
- if (ret < 0) {
+ if (error_is_set(&local_err)) {
error_propagate(errp, local_err);
goto the_end;
}
--
1.8.1.4
- [Qemu-devel] [PATCH v4 02/11] block: add error parameter to del_existing_snapshots(), (continued)
- [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, 2013/03/29
- [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 <=
- [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