This allows descent error information to be reported. Signed-off-by: Fam Zheng <f...@redhat.com> --- block/snapshot.c | 5 +++-- blockdev.c | 2 +- include/block/snapshot.h | 3 ++- qemu-img.c | 2 +- savevm.c | 2 +- 5 files changed, 8 insertions(+), 6 deletions(-)
diff --git a/block/snapshot.c b/block/snapshot.c index 9047f8d..02cfb07 100644 --- a/block/snapshot.c +++ b/block/snapshot.c @@ -157,7 +157,8 @@ int bdrv_can_snapshot(BlockDriverState *bs) } int bdrv_snapshot_create(BlockDriverState *bs, - QEMUSnapshotInfo *sn_info) + QEMUSnapshotInfo *sn_info, + Error **errp) { BlockDriver *drv = bs->drv; if (!drv) { @@ -167,7 +168,7 @@ int bdrv_snapshot_create(BlockDriverState *bs, return drv->bdrv_snapshot_create(bs, sn_info); } if (bs->file) { - return bdrv_snapshot_create(bs->file, sn_info); + return bdrv_snapshot_create(bs->file, sn_info, errp); } return -ENOTSUP; } diff --git a/blockdev.c b/blockdev.c index 369d8da..404159e 100644 --- a/blockdev.c +++ b/blockdev.c @@ -1138,7 +1138,7 @@ static void internal_snapshot_prepare(BlkTransactionState *common, sn->date_nsec = tv.tv_usec * 1000; sn->vm_clock_nsec = qemu_clock_get_ns(QEMU_CLOCK_VIRTUAL); - ret1 = bdrv_snapshot_create(bs, sn); + ret1 = bdrv_snapshot_create(bs, sn, errp); if (ret1 < 0) { error_setg_errno(errp, -ret1, "Failed to create snapshot '%s' on device '%s'", diff --git a/include/block/snapshot.h b/include/block/snapshot.h index 770d9bb..5fe5834 100644 --- a/include/block/snapshot.h +++ b/include/block/snapshot.h @@ -56,7 +56,8 @@ bool bdrv_snapshot_find_by_id_and_name(BlockDriverState *bs, Error **errp); int bdrv_can_snapshot(BlockDriverState *bs); int bdrv_snapshot_create(BlockDriverState *bs, - QEMUSnapshotInfo *sn_info); + QEMUSnapshotInfo *sn_info, + Error **errp); int bdrv_snapshot_goto(BlockDriverState *bs, const char *snapshot_id); int bdrv_snapshot_delete(BlockDriverState *bs, diff --git a/qemu-img.c b/qemu-img.c index 7dfe982..54b1d23 100644 --- a/qemu-img.c +++ b/qemu-img.c @@ -2151,7 +2151,7 @@ static int img_snapshot(int argc, char **argv) sn.date_sec = tv.tv_sec; sn.date_nsec = tv.tv_usec * 1000; - ret = bdrv_snapshot_create(bs, &sn); + ret = bdrv_snapshot_create(bs, &sn, NULL); if (ret) { error_report("Could not create snapshot '%s': %d (%s)", snapshot_name, ret, strerror(-ret)); diff --git a/savevm.c b/savevm.c index 3f912dd..75e5093 100644 --- a/savevm.c +++ b/savevm.c @@ -2439,7 +2439,7 @@ void do_savevm(Monitor *mon, const QDict *qdict) if (bdrv_can_snapshot(bs1)) { /* Write VM state size only to the image that contains the state */ sn->vm_state_size = (bs == bs1 ? vm_state_size : 0); - ret = bdrv_snapshot_create(bs1, sn); + ret = bdrv_snapshot_create(bs1, sn, NULL); if (ret < 0) { monitor_printf(mon, "Error while creating snapshot on '%s'\n", bdrv_get_device_name(bs1)); -- 1.8.5.1