summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJeff Cody2017-04-07 22:55:32 +0200
committerJeff Cody2017-04-24 21:09:33 +0200
commit56e7cf8df03ae142c7797435dc0ece80a42f4fd0 (patch)
treef976cdb2935eb7e77b6a5943580a7d70948b672e
parentblock/rbd - update variable names to more apt names (diff)
downloadqemu-56e7cf8df03ae142c7797435dc0ece80a42f4fd0.tar.gz
qemu-56e7cf8df03ae142c7797435dc0ece80a42f4fd0.tar.xz
qemu-56e7cf8df03ae142c7797435dc0ece80a42f4fd0.zip
block/rbd: Add support for reopen()
This adds support for reopen in rbd, for changing between r/w and r/o. Note, that this is only a flag change, but we will block a change from r/o to r/w if we are using an RBD internal snapshot. Reviewed-by: Stefan Hajnoczi <stefanha@redhat.com> Signed-off-by: Jeff Cody <jcody@redhat.com> Reviewed-by: John Snow <jsnow@redhat.com> Message-id: d4e87539167ec6527d44c97b164eabcccf96e4f3.1491597120.git.jcody@redhat.com
-rw-r--r--block/rbd.c21
1 files changed, 21 insertions, 0 deletions
diff --git a/block/rbd.c b/block/rbd.c
index 35853c9ba4..6471f4fd2b 100644
--- a/block/rbd.c
+++ b/block/rbd.c
@@ -668,6 +668,26 @@ failed_opts:
return r;
}
+
+/* Since RBD is currently always opened R/W via the API,
+ * we just need to check if we are using a snapshot or not, in
+ * order to determine if we will allow it to be R/W */
+static int qemu_rbd_reopen_prepare(BDRVReopenState *state,
+ BlockReopenQueue *queue, Error **errp)
+{
+ BDRVRBDState *s = state->bs->opaque;
+ int ret = 0;
+
+ if (s->snap && state->flags & BDRV_O_RDWR) {
+ error_setg(errp,
+ "Cannot change node '%s' to r/w when using RBD snapshot",
+ bdrv_get_device_or_node_name(state->bs));
+ ret = -EINVAL;
+ }
+
+ return ret;
+}
+
static void qemu_rbd_close(BlockDriverState *bs)
{
BDRVRBDState *s = bs->opaque;
@@ -1074,6 +1094,7 @@ static BlockDriver bdrv_rbd = {
.bdrv_parse_filename = qemu_rbd_parse_filename,
.bdrv_file_open = qemu_rbd_open,
.bdrv_close = qemu_rbd_close,
+ .bdrv_reopen_prepare = qemu_rbd_reopen_prepare,
.bdrv_create = qemu_rbd_create,
.bdrv_has_zero_init = bdrv_has_zero_init_1,
.bdrv_get_info = qemu_rbd_getinfo,