[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-block] [PULL 3/7] block: Add errp to bdrv_snapshot_goto()
From: |
Kevin Wolf |
Subject: |
[Qemu-block] [PULL 3/7] block: Add errp to bdrv_snapshot_goto() |
Date: |
Tue, 21 Nov 2017 16:10:13 +0100 |
Signed-off-by: Kevin Wolf <address@hidden>
Reviewed-by: Vladimir Sementsov-Ogievskiy <address@hidden>
Reviewed-by: John Snow <address@hidden>
---
include/block/snapshot.h | 3 ++-
block/snapshot.c | 23 +++++++++++++++++------
qemu-img.c | 6 +++---
3 files changed, 22 insertions(+), 10 deletions(-)
diff --git a/include/block/snapshot.h b/include/block/snapshot.h
index e5c0553115..aeb80405e8 100644
--- a/include/block/snapshot.h
+++ b/include/block/snapshot.h
@@ -57,7 +57,8 @@ int bdrv_can_snapshot(BlockDriverState *bs);
int bdrv_snapshot_create(BlockDriverState *bs,
QEMUSnapshotInfo *sn_info);
int bdrv_snapshot_goto(BlockDriverState *bs,
- const char *snapshot_id);
+ const char *snapshot_id,
+ Error **errp);
int bdrv_snapshot_delete(BlockDriverState *bs,
const char *snapshot_id,
const char *name,
diff --git a/block/snapshot.c b/block/snapshot.c
index be0743abac..75562df4cc 100644
--- a/block/snapshot.c
+++ b/block/snapshot.c
@@ -177,18 +177,21 @@ int bdrv_snapshot_create(BlockDriverState *bs,
}
int bdrv_snapshot_goto(BlockDriverState *bs,
- const char *snapshot_id)
+ const char *snapshot_id,
+ Error **errp)
{
BlockDriver *drv = bs->drv;
int ret, open_ret;
int64_t len;
if (!drv) {
+ error_setg(errp, "Block driver is closed");
return -ENOMEDIUM;
}
len = bdrv_getlength(bs);
if (len < 0) {
+ error_setg_errno(errp, -len, "Cannot get block device size");
return len;
}
/* We should set all bits in all enabled dirty bitmaps, because dirty
@@ -200,13 +203,18 @@ int bdrv_snapshot_goto(BlockDriverState *bs,
bdrv_set_dirty(bs, 0, len);
if (drv->bdrv_snapshot_goto) {
- return drv->bdrv_snapshot_goto(bs, snapshot_id);
+ ret = drv->bdrv_snapshot_goto(bs, snapshot_id);
+ if (ret < 0) {
+ error_setg_errno(errp, -ret, "Failed to load snapshot");
+ }
+ return ret;
}
if (bs->file) {
BlockDriverState *file;
QDict *options = qdict_clone_shallow(bs->options);
QDict *file_options;
+ Error *local_err = NULL;
file = bs->file->bs;
/* Prevent it from getting deleted when detached from bs */
@@ -220,13 +228,15 @@ int bdrv_snapshot_goto(BlockDriverState *bs,
bdrv_unref_child(bs, bs->file);
bs->file = NULL;
- ret = bdrv_snapshot_goto(file, snapshot_id);
- open_ret = drv->bdrv_open(bs, options, bs->open_flags, NULL);
+ ret = bdrv_snapshot_goto(file, snapshot_id, errp);
+ open_ret = drv->bdrv_open(bs, options, bs->open_flags, &local_err);
QDECREF(options);
if (open_ret < 0) {
bdrv_unref(file);
bs->drv = NULL;
- return open_ret;
+ /* A bdrv_snapshot_goto() error takes precedence */
+ error_propagate(errp, local_err);
+ return ret < 0 ? ret : open_ret;
}
assert(bs->file->bs == file);
@@ -234,6 +244,7 @@ int bdrv_snapshot_goto(BlockDriverState *bs,
return ret;
}
+ error_setg(errp, "Block driver does not support snapshots");
return -ENOTSUP;
}
@@ -467,7 +478,7 @@ int bdrv_all_goto_snapshot(const char *name,
BlockDriverState **first_bad_bs)
aio_context_acquire(ctx);
if (bdrv_can_snapshot(bs)) {
- err = bdrv_snapshot_goto(bs, name);
+ err = bdrv_snapshot_goto(bs, name, NULL);
}
aio_context_release(ctx);
if (err < 0) {
diff --git a/qemu-img.c b/qemu-img.c
index 02a6e27beb..68b375f998 100644
--- a/qemu-img.c
+++ b/qemu-img.c
@@ -2989,10 +2989,10 @@ static int img_snapshot(int argc, char **argv)
break;
case SNAPSHOT_APPLY:
- ret = bdrv_snapshot_goto(bs, snapshot_name);
+ ret = bdrv_snapshot_goto(bs, snapshot_name, &err);
if (ret) {
- error_report("Could not apply snapshot '%s': %d (%s)",
- snapshot_name, ret, strerror(-ret));
+ error_reportf_err(err, "Could not apply snapshot '%s': ",
+ snapshot_name);
}
break;
--
2.13.6
- [Qemu-block] [PULL 0/7] Block layer patches for 2.11.0-rc2, Kevin Wolf, 2017/11/21
- [Qemu-block] [PULL 1/7] block: Don't use BLK_PERM_CONSISTENT_READ for format probing, Kevin Wolf, 2017/11/21
- [Qemu-block] [PULL 2/7] block: Don't request I/O permission with BDRV_O_NO_IO, Kevin Wolf, 2017/11/21
- [Qemu-block] [PULL 3/7] block: Add errp to bdrv_snapshot_goto(),
Kevin Wolf <=
- [Qemu-block] [PULL 4/7] block: Add errp to bdrv_all_goto_snapshot(), Kevin Wolf, 2017/11/21
- [Qemu-block] [PULL 5/7] block: Error out on load_vm with active dirty bitmaps, Kevin Wolf, 2017/11/21
- [Qemu-block] [PULL 6/7] block: Close a BlockDriverState completely even when bs->drv is NULL, Kevin Wolf, 2017/11/21
- [Qemu-block] [PULL 7/7] iotests: Fix 176 on 32-bit host, Kevin Wolf, 2017/11/21
- Re: [Qemu-block] [PULL 0/7] Block layer patches for 2.11.0-rc2, Peter Maydell, 2017/11/21