diff options
| author | Kevin Wolf <kwolf@redhat.com> | 2018-10-12 11:27:41 +0200 |
|---|---|---|
| committer | Kevin Wolf <kwolf@redhat.com> | 2018-11-05 15:09:55 +0100 |
| commit | eaa2410f1ea864609090c0a5fda9e0ce9499da79 (patch) | |
| tree | 68021063e0cf17887ba5cad0e7687dd485bd8ed5 /block/rbd.c | |
| parent | a51b9c4862c29f427931f45ee1d39ac1663ba859 (diff) | |
| download | qemu-eaa2410f1ea864609090c0a5fda9e0ce9499da79.zip | |
block: Require auto-read-only for existing fallbacks
Some block drivers have traditionally changed their node to read-only
mode without asking the user. This behaviour has been marked deprecated
since 2.11, expecting users to provide an explicit read-only=on option.
Now that we have auto-read-only=on, enable these drivers to make use of
the option.
This is the only use of bdrv_set_read_only(), so we can make it a bit
more specific and turn it into a bdrv_apply_auto_read_only() that is
more convenient for drivers to use.
Signed-off-by: Kevin Wolf <kwolf@redhat.com>
Reviewed-by: Eric Blake <eblake@redhat.com>
Diffstat (limited to 'block/rbd.c')
| -rw-r--r-- | block/rbd.c | 15 |
1 files changed, 4 insertions, 11 deletions
diff --git a/block/rbd.c b/block/rbd.c index 1e9819a50f..8a1a9f4b6e 100644 --- a/block/rbd.c +++ b/block/rbd.c @@ -780,17 +780,10 @@ static int qemu_rbd_open(BlockDriverState *bs, QDict *options, int flags, /* If we are using an rbd snapshot, we must be r/o, otherwise * leave as-is */ if (s->snap != NULL) { - if (!bdrv_is_read_only(bs)) { - error_report("Opening rbd snapshots without an explicit " - "read-only=on option is deprecated. Future versions " - "will refuse to open the image instead of " - "automatically marking the image read-only."); - r = bdrv_set_read_only(bs, true, &local_err); - if (r < 0) { - rbd_close(s->image); - error_propagate(errp, local_err); - goto failed_open; - } + r = bdrv_apply_auto_read_only(bs, "rbd snapshots are read-only", errp); + if (r < 0) { + rbd_close(s->image); + goto failed_open; } } |