[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH v4 02/11] block: add error parameter to del_existing
From: |
Pavel Hrdina |
Subject: |
[Qemu-devel] [PATCH v4 02/11] block: add error parameter to del_existing_snapshots() |
Date: |
Fri, 29 Mar 2013 15:12:29 +0100 |
Signed-off-by: Pavel Hrdina <address@hidden>
Reviewed-by: Eric Blake <address@hidden>
---
savevm.c | 12 +++++++-----
1 file changed, 7 insertions(+), 5 deletions(-)
diff --git a/savevm.c b/savevm.c
index 77c5291..dc1f4a4 100644
--- a/savevm.c
+++ b/savevm.c
@@ -2224,7 +2224,7 @@ static int bdrv_snapshot_find(BlockDriverState *bs,
QEMUSnapshotInfo *sn_info,
/*
* Deletes snapshots of a given name in all opened images.
*/
-static int del_existing_snapshots(Monitor *mon, const char *name)
+static int del_existing_snapshots(const char *name, Error **errp)
{
BlockDriverState *bs;
QEMUSnapshotInfo sn1, *snapshot = &sn1;
@@ -2237,9 +2237,8 @@ static int del_existing_snapshots(Monitor *mon, const
char *name)
{
ret = bdrv_snapshot_delete(bs, name);
if (ret < 0) {
- monitor_printf(mon,
- "Error while deleting snapshot on '%s'\n",
- bdrv_get_device_name(bs));
+ error_setg(errp, "error while deleting snapshot on '%s'",
+ bdrv_get_device_name(bs));
return -1;
}
}
@@ -2259,6 +2258,7 @@ void do_savevm(Monitor *mon, const QDict *qdict)
qemu_timeval tv;
struct tm tm;
const char *name = qdict_get_try_str(qdict, "name");
+ Error *local_err = NULL;
/* Verify if there is a device that doesn't support snapshots and is
writable */
bs = NULL;
@@ -2307,7 +2307,9 @@ void do_savevm(Monitor *mon, const QDict *qdict)
}
/* Delete old snapshots of the same name */
- if (name && del_existing_snapshots(mon, name) < 0) {
+ if (name && del_existing_snapshots(name, &local_err) < 0) {
+ monitor_printf(mon, "%s\n", error_get_pretty(local_err));
+ error_free(local_err);
goto the_end;
}
--
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 <=
- [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, 2013/03/29