From: Jeff Cody <jcody@redhat.com>
To: qemu-block@nongnu.org
Cc: peter.maydell@linaro.org, jcody@redhat.com, qemu-devel@nongnu.org
Subject: [Qemu-devel] [PULL 11/12] block/rbd: Add support for reopen()
Date: Fri, 21 Apr 2017 09:46:43 -0400 [thread overview]
Message-ID: <20170421134644.10239-12-jcody@redhat.com> (raw)
In-Reply-To: <20170421134644.10239-1-jcody@redhat.com>
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
---
block/rbd.c | 21 +++++++++++++++++++++
1 file changed, 21 insertions(+)
diff --git a/block/rbd.c b/block/rbd.c
index 35853c9..6471f4f 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,
--
2.9.3
next prev parent reply other threads:[~2017-04-21 13:47 UTC|newest]
Thread overview: 14+ messages / expand[flat|nested] mbox.gz Atom feed top
2017-04-21 13:46 [Qemu-devel] [PULL 00/12] Block patches Jeff Cody
2017-04-21 13:46 ` [Qemu-devel] [PULL 01/12] block/vxhs.c: Add support for a new block device type called "vxhs" Jeff Cody
2017-04-21 13:46 ` [Qemu-devel] [PULL 02/12] block/vxhs.c: Add qemu-iotests for new block device type "vxhs" Jeff Cody
2017-04-21 13:46 ` [Qemu-devel] [PULL 03/12] qemu-iotests: exclude vxhs from image creation via protocol Jeff Cody
2017-04-21 13:46 ` [Qemu-devel] [PULL 04/12] block: add bdrv_set_read_only() helper function Jeff Cody
2017-04-21 13:46 ` [Qemu-devel] [PULL 05/12] block: do not set BDS read_only if copy_on_read enabled Jeff Cody
2017-04-21 13:46 ` [Qemu-devel] [PULL 06/12] block: honor BDRV_O_ALLOW_RDWR when clearing bs->read_only Jeff Cody
2017-04-21 13:46 ` [Qemu-devel] [PULL 07/12] block: code movement Jeff Cody
2017-04-21 13:46 ` [Qemu-devel] [PULL 08/12] block: introduce bdrv_can_set_read_only() Jeff Cody
2017-04-21 13:46 ` [Qemu-devel] [PULL 09/12] block: use bdrv_can_set_read_only() during reopen Jeff Cody
2017-04-21 13:46 ` [Qemu-devel] [PULL 10/12] block/rbd - update variable names to more apt names Jeff Cody
2017-04-21 13:46 ` Jeff Cody [this message]
2017-04-21 13:46 ` [Qemu-devel] [PULL 12/12] qemu-iotests: _cleanup_qemu must be called on exit Jeff Cody
2017-04-21 16:55 ` [Qemu-devel] [PULL 00/12] Block patches Peter Maydell
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20170421134644.10239-12-jcody@redhat.com \
--to=jcody@redhat.com \
--cc=peter.maydell@linaro.org \
--cc=qemu-block@nongnu.org \
--cc=qemu-devel@nongnu.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).