Signed-off-by: Pavel Hrdina <phrd...@redhat.com> --- savevm.c | 12 ++++-------- 1 file changed, 4 insertions(+), 8 deletions(-)
diff --git a/savevm.c b/savevm.c index 55b65cf..0d14f71 100644 --- a/savevm.c +++ b/savevm.c @@ -2048,22 +2048,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; } } @@ -2148,7 +2144,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.7.11.2