block: Apply auto-read-only for ro-whitelist drivers
PATCH 1/1 block: Apply auto-read-only for ro-whitelist drivers
If QEMU was configured with a driver in --block-drv-ro-whitelist, trying to use that driver read-write resulted in an error message even if auto-read-only=on was set.
Consider auto-read-only=on for the whitelist checking and use it to automatically degrade to read-only for block drivers on the read-only whitelist.
--- block.c | 20 +++++++++++++------- 1 file changed, 13 insertions(+), 7 deletions(-)
block.c +13 -7
@@ -1438,13 +1438,19 @@ static int bdrv_open_common(BlockDriverState *bs, BlockBackend *file, bs->read_only = !(bs->open_flags &BDRV_O_RDWR );if (use_bdrv_whitelist && !bdrv_is_whitelisted (drv, bs->read_only)) { -error_setg (errp, - !bs->read_only &&bdrv_is_whitelisted (drv, true) - ?"Driver '%s' can only be used for read-only devices" - :"Driver '%s' is not whitelisted" , - drv->format_name); - ret = -ENOTSUP ; - goto fail_opts; +if (!bs->read_only &&bdrv_is_whitelisted (drv, true)) { + ret =bdrv_apply_auto_read_only (bs,NULL ,NULL ); + }else { + ret = -ENOTSUP ; + } +if (ret <0 ) { +error_setg (errp, + !bs->read_only &&bdrv_is_whitelisted (drv, true) + ?"Driver '%s' can only be used for read-only devices" + :"Driver '%s' is not whitelisted" , + drv->format_name); + goto fail_opts; + } }/* bdrv_new() and bdrv_close() make it so */
Signature · 1 line
2.20.1
Quoted 4 lines · Kevin Wolf
If QEMU was configured with a driver in --block-drv-ro-whitelist, trying to use that driver read-write resulted in an error message even if auto-read-only=on was set.
Quoted 9 lines
Consider auto-read-only=on for the whitelist checking and use it to automatically degrade to read-only for block drivers on the read-only whitelist.
Signed-off-by Kevin Wolf <[email protected]>--- block.c | 20 +++++++++++++------- 1 file changed, 13 insertions(+), 7 deletions(-)
Signature · 3 lines
Eric Blake, Principal Software Engineer Red Hat, Inc. +1-919-301-3226 Virtualization: qemu.org | libvirt.org
Quoted 4 lines · Kevin Wolf
If QEMU was configured with a driver in --block-drv-ro-whitelist, trying to use that driver read-write resulted in an error message even if auto-read-only=on was set.
Quoted 8 lines
Consider auto-read-only=on for the whitelist checking and use it to automatically degrade to read-only for block drivers on the read-only whitelist.
Signed-off-by Kevin Wolf <[email protected]>--- block.c | 20 +++++++++++++------- 1 file changed, 13 insertions(+), 7 deletions(-)