diff options
| author | Jeff Cody | 2017-04-07 22:55:27 +0200 |
|---|---|---|
| committer | Jeff Cody | 2017-04-24 21:09:33 +0200 |
| commit | d6fcdf06d9fc7d72151cc2069dc5c1adf5c21707 (patch) | |
| tree | 540436244a6886cb53b4e2cd9beb10f67526b6a1 /block.c | |
| parent | block: do not set BDS read_only if copy_on_read enabled (diff) | |
| download | qemu-d6fcdf06d9fc7d72151cc2069dc5c1adf5c21707.tar.gz qemu-d6fcdf06d9fc7d72151cc2069dc5c1adf5c21707.tar.xz qemu-d6fcdf06d9fc7d72151cc2069dc5c1adf5c21707.zip | |
block: honor BDRV_O_ALLOW_RDWR when clearing bs->read_only
The BDRV_O_ALLOW_RDWR flag allows / prohibits the changing of
the BDS 'read_only' state, but there are a few places where it
is ignored. In the bdrv_set_read_only() helper, make sure to
honor the flag.
Signed-off-by: Jeff Cody <jcody@redhat.com>
Reviewed-by: Stefan Hajnoczi <stefanha@redhat.com>
Reviewed-by: John Snow <jsnow@redhat.com>
Message-id: be2e5fb2d285cbece2b6d06bed54a6f56520d251.1491597120.git.jcody@redhat.com
Diffstat (limited to 'block.c')
| -rw-r--r-- | block.c | 7 |
1 files changed, 7 insertions, 0 deletions
@@ -201,6 +201,13 @@ int bdrv_set_read_only(BlockDriverState *bs, bool read_only, Error **errp) return -EINVAL; } + /* Do not clear read_only if it is prohibited */ + if (!read_only && !(bs->open_flags & BDRV_O_ALLOW_RDWR)) { + error_setg(errp, "Node '%s' is read only", + bdrv_get_device_or_node_name(bs)); + return -EPERM; + } + bs->read_only = read_only; return 0; } |