[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-block] [PULL 06/12] block: honor BDRV_O_ALLOW_RDWR when clearing b
From: |
Jeff Cody |
Subject: |
[Qemu-block] [PULL 06/12] block: honor BDRV_O_ALLOW_RDWR when clearing bs->read_only |
Date: |
Fri, 21 Apr 2017 09:46:38 -0400 |
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 <address@hidden>
Reviewed-by: Stefan Hajnoczi <address@hidden>
Reviewed-by: John Snow <address@hidden>
Message-id: address@hidden
---
block.c | 7 +++++++
1 file changed, 7 insertions(+)
diff --git a/block.c b/block.c
index 4766b8a..b74d445 100644
--- a/block.c
+++ b/block.c
@@ -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;
}
--
2.9.3
- [Qemu-block] [PULL 00/12] Block patches, Jeff Cody, 2017/04/21
- [Qemu-block] [PULL 03/12] qemu-iotests: exclude vxhs from image creation via protocol, Jeff Cody, 2017/04/21
- [Qemu-block] [PULL 02/12] block/vxhs.c: Add qemu-iotests for new block device type "vxhs", Jeff Cody, 2017/04/21
- [Qemu-block] [PULL 05/12] block: do not set BDS read_only if copy_on_read enabled, Jeff Cody, 2017/04/21
- [Qemu-block] [PULL 04/12] block: add bdrv_set_read_only() helper function, Jeff Cody, 2017/04/21
- [Qemu-block] [PULL 01/12] block/vxhs.c: Add support for a new block device type called "vxhs", Jeff Cody, 2017/04/21
- [Qemu-block] [PULL 06/12] block: honor BDRV_O_ALLOW_RDWR when clearing bs->read_only,
Jeff Cody <=
- [Qemu-block] [PULL 07/12] block: code movement, Jeff Cody, 2017/04/21
- [Qemu-block] [PULL 08/12] block: introduce bdrv_can_set_read_only(), Jeff Cody, 2017/04/21
- [Qemu-block] [PULL 11/12] block/rbd: Add support for reopen(), Jeff Cody, 2017/04/21
- [Qemu-block] [PULL 10/12] block/rbd - update variable names to more apt names, Jeff Cody, 2017/04/21
- [Qemu-block] [PULL 09/12] block: use bdrv_can_set_read_only() during reopen, Jeff Cody, 2017/04/21
- [Qemu-block] [PULL 12/12] qemu-iotests: _cleanup_qemu must be called on exit, Jeff Cody, 2017/04/21
- Re: [Qemu-block] [PULL 00/12] Block patches, Peter Maydell, 2017/04/21