[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH v2 07/17] block: add error parameter to del_existing
From: |
Pavel Hrdina |
Subject: |
[Qemu-devel] [PATCH v2 07/17] block: add error parameter to del_existing_snapshots() |
Date: |
Thu, 13 Dec 2012 16:40:41 +0100 |
Signed-off-by: Pavel Hrdina <address@hidden>
---
savevm.c | 12 ++++--------
1 file changed, 4 insertions(+), 8 deletions(-)
diff --git a/savevm.c b/savevm.c
index 7ab7c7c..3ee7da5 100644
--- a/savevm.c
+++ b/savevm.c
@@ -2094,22 +2094,18 @@ static int bdrv_snapshot_find(BlockDriverState *bs,
/*
* 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;
- int ret;
bs = NULL;
while ((bs = bdrv_next(bs))) {
if (bdrv_can_snapshot(bs) &&
bdrv_snapshot_find(bs, snapshot, name, NULL) >= 0)
{
- ret = bdrv_snapshot_delete(bs, name, NULL);
- if (ret < 0) {
- monitor_printf(mon,
- "Error while deleting snapshot on '%s'\n",
- bdrv_get_device_name(bs));
+ if (bdrv_snapshot_delete(bs, name, errp) < 0) {
return -1;
}
}
@@ -2194,7 +2190,7 @@ 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, NULL) < 0) {
goto the_end;
}
--
1.8.0.2
- [Qemu-devel] [PATCH v2 00/17] qapi: Convert savevm, loadvm, delvm and info snapshots, Pavel Hrdina, 2012/12/13
- [Qemu-devel] [PATCH v2 01/17] error: introduce handle_error, Pavel Hrdina, 2012/12/13
- [Qemu-devel] [PATCH v2 08/17] savevm: add error parameter to qemu_savevm_state_begin(), Pavel Hrdina, 2012/12/13
- [Qemu-devel] [PATCH v2 03/17] block: add error parameter to bdrv_snapshot_goto() and related functions, Pavel Hrdina, 2012/12/13
- [Qemu-devel] [PATCH v2 07/17] block: add error parameter to del_existing_snapshots(),
Pavel Hrdina <=
- [Qemu-devel] [PATCH v2 02/17] block: add error parameter to bdrv_snapshot_create() and related functions, Pavel Hrdina, 2012/12/13
- [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