Signed-off-by: Pavel Hrdina <phrd...@redhat.com> --- block.c | 26 ++++++++++++++++++-------- block.h | 4 +++- block/qcow2-snapshot.c | 9 ++++++++- block/qcow2.h | 4 +++- block/rbd.c | 6 +++++- block/sheepdog.c | 4 +++- block_int.h | 4 +++- qemu-img.c | 2 +- savevm.c | 4 ++-- 9 files changed, 46 insertions(+), 17 deletions(-)
diff --git a/block.c b/block.c index ad25184..1480777 100644 --- a/block.c +++ b/block.c @@ -2712,16 +2712,26 @@ int bdrv_snapshot_goto(BlockDriverState *bs, return ret; } -int bdrv_snapshot_delete(BlockDriverState *bs, const char *snapshot_id) +int bdrv_snapshot_delete(BlockDriverState *bs, + const char *snapshot_id, + Error **errp) { BlockDriver *drv = bs->drv; - if (!drv) - return -ENOMEDIUM; - if (drv->bdrv_snapshot_delete) - return drv->bdrv_snapshot_delete(bs, snapshot_id); - if (bs->file) - return bdrv_snapshot_delete(bs->file, snapshot_id); - return -ENOTSUP; + int ret; + + if (!drv) { + error_set(errp, QERR_DEVICE_HAS_NO_MEDIUM, bdrv_get_device_name(bs)); + ret = -ENOMEDIUM; + } else if (drv->bdrv_snapshot_delete) { + ret = drv->bdrv_snapshot_delete(bs, snapshot_id, errp); + } else if (bs->file) { + ret = bdrv_snapshot_delete(bs->file, snapshot_id, errp); + } else { + error_set(errp, QERR_NOT_SUPPORTED); + ret = -ENOTSUP; + } + + return ret; } int bdrv_snapshot_list(BlockDriverState *bs, diff --git a/block.h b/block.h index 11edcd3..72586f2 100644 --- a/block.h +++ b/block.h @@ -301,7 +301,9 @@ int bdrv_snapshot_create(BlockDriverState *bs, int bdrv_snapshot_goto(BlockDriverState *bs, const char *snapshot_id, Error **errp); -int bdrv_snapshot_delete(BlockDriverState *bs, const char *snapshot_id); +int bdrv_snapshot_delete(BlockDriverState *bs, + const char *snapshot_id, + Error **errp); int bdrv_snapshot_list(BlockDriverState *bs, QEMUSnapshotInfo **psn_info); int bdrv_snapshot_load_tmp(BlockDriverState *bs, diff --git a/block/qcow2-snapshot.c b/block/qcow2-snapshot.c index 8a87b0c..9162a5b 100644 --- a/block/qcow2-snapshot.c +++ b/block/qcow2-snapshot.c @@ -544,7 +544,9 @@ fail: return ret; } -int qcow2_snapshot_delete(BlockDriverState *bs, const char *snapshot_id) +int qcow2_snapshot_delete(BlockDriverState *bs, + const char *snapshot_id, + Error **errp) { BDRVQcowState *s = bs->opaque; QCowSnapshot sn; @@ -553,6 +555,8 @@ int qcow2_snapshot_delete(BlockDriverState *bs, const char *snapshot_id) /* Search the snapshot */ snapshot_index = find_snapshot_by_id_or_name(bs, snapshot_id); if (snapshot_index < 0) { + error_set(errp, QERR_INVALID_PARAMETER_VALUE, + "name", "existing snapshot id or tag"); return -ENOENT; } sn = s->snapshots[snapshot_index]; @@ -564,6 +568,7 @@ int qcow2_snapshot_delete(BlockDriverState *bs, const char *snapshot_id) s->nb_snapshots--; ret = qcow2_write_snapshots(bs); if (ret < 0) { + error_set(errp, QERR_GENERIC_ERROR, ret); return ret; } @@ -581,6 +586,7 @@ int qcow2_snapshot_delete(BlockDriverState *bs, const char *snapshot_id) ret = qcow2_update_snapshot_refcount(bs, sn.l1_table_offset, sn.l1_size, -1); if (ret < 0) { + error_set(errp, QERR_GENERIC_ERROR, ret); return ret; } qcow2_free_clusters(bs, sn.l1_table_offset, sn.l1_size * sizeof(uint64_t)); @@ -588,6 +594,7 @@ int qcow2_snapshot_delete(BlockDriverState *bs, const char *snapshot_id) /* must update the copied flag on the current cluster offsets */ ret = qcow2_update_snapshot_refcount(bs, s->l1_table_offset, s->l1_size, 0); if (ret < 0) { + error_set(errp, QERR_GENERIC_ERROR, ret); return ret; } diff --git a/block/qcow2.h b/block/qcow2.h index 6babb56..8dfdbb7 100644 --- a/block/qcow2.h +++ b/block/qcow2.h @@ -314,7 +314,9 @@ int qcow2_snapshot_create(BlockDriverState *bs, int qcow2_snapshot_goto(BlockDriverState *bs, const char *snapshot_id, Error **errp); -int qcow2_snapshot_delete(BlockDriverState *bs, const char *snapshot_id); +int qcow2_snapshot_delete(BlockDriverState *bs, + const char *snapshot_id, + Error **errp); int qcow2_snapshot_list(BlockDriverState *bs, QEMUSnapshotInfo **psn_tab); int qcow2_snapshot_load_tmp(BlockDriverState *bs, const char *snapshot_name); diff --git a/block/rbd.c b/block/rbd.c index 5a73d8a..448d68d 100644 --- a/block/rbd.c +++ b/block/rbd.c @@ -857,12 +857,16 @@ static int qemu_rbd_snap_create(BlockDriverState *bs, } static int qemu_rbd_snap_remove(BlockDriverState *bs, - const char *snapshot_name) + const char *snapshot_name, + Error **errp) { BDRVRBDState *s = bs->opaque; int r; r = rbd_snap_remove(s->image, snapshot_name); + if (r < 0) { + error_set(errp, QERR_GENERIC_ERROR, r); + } return r; } diff --git a/block/sheepdog.c b/block/sheepdog.c index 557ff92..f864071 100644 --- a/block/sheepdog.c +++ b/block/sheepdog.c @@ -1872,7 +1872,9 @@ out: return ret; } -static int sd_snapshot_delete(BlockDriverState *bs, const char *snapshot_id) +static int sd_snapshot_delete(BlockDriverState *bs, + const char *snapshot_id, + Error **errp) { /* FIXME: Delete specified snapshot id. */ return 0; diff --git a/block_int.h b/block_int.h index fa6d72f..4799abd 100644 --- a/block_int.h +++ b/block_int.h @@ -211,7 +211,9 @@ struct BlockDriver { int (*bdrv_snapshot_goto)(BlockDriverState *bs, const char *snapshot_id, Error **errp); - int (*bdrv_snapshot_delete)(BlockDriverState *bs, const char *snapshot_id); + int (*bdrv_snapshot_delete)(BlockDriverState *bs, + const char *snapshot_id, + Error **errp); int (*bdrv_snapshot_list)(BlockDriverState *bs, QEMUSnapshotInfo **psn_info); int (*bdrv_snapshot_load_tmp)(BlockDriverState *bs, diff --git a/qemu-img.c b/qemu-img.c index 1f10ff4..6ac1904 100644 --- a/qemu-img.c +++ b/qemu-img.c @@ -1283,7 +1283,7 @@ static int img_snapshot(int argc, char **argv) break; case SNAPSHOT_DELETE: - ret = bdrv_snapshot_delete(bs, snapshot_name); + ret = bdrv_snapshot_delete(bs, snapshot_name, NULL); if (ret) { error_report("Could not delete snapshot '%s': %d (%s)", snapshot_name, ret, strerror(-ret)); diff --git a/savevm.c b/savevm.c index 0931e54..4cf92d5 100644 --- a/savevm.c +++ b/savevm.c @@ -2051,7 +2051,7 @@ static int del_existing_snapshots(Monitor *mon, const char *name) if (bdrv_can_snapshot(bs) && bdrv_snapshot_find(bs, snapshot, name) >= 0) { - ret = bdrv_snapshot_delete(bs, name); + ret = bdrv_snapshot_delete(bs, name, NULL); if (ret < 0) { monitor_printf(mon, "Error while deleting snapshot on '%s'\n", @@ -2299,7 +2299,7 @@ void do_delvm(Monitor *mon, const QDict *qdict) bs1 = NULL; while ((bs1 = bdrv_next(bs1))) { if (bdrv_can_snapshot(bs1)) { - ret = bdrv_snapshot_delete(bs1, name); + ret = bdrv_snapshot_delete(bs1, name, NULL); if (ret < 0) { if (ret == -ENOTSUP) monitor_printf(mon, -- 1.7.11.2