OpenE2K
/
qemu-e2k
13
4
Fork 0
Code Issues 4 Pull Requests Projects 2 Releases Activity

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.

Signed-off-by: Kevin Wolf <kwolf@redhat.com>
Reviewed-by: Eric Blake <eblake@redhat.com>
Reviewed-by: Stefan Hajnoczi <stefanha@redhat.com>
This commit is contained in:
Kevin Wolf 2019-01-22 13:15:31 +01:00
parent 1324f06384
commit 8be25de643
1 changed files with 13 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
block.c
View File

@ -1438,14 +1438,20 @@ static int bdrv_open_common(BlockDriverState *bs, BlockBackend *file,
bs->read_only = !(bs->open_flags & BDRV_O_RDWR); bs->read_only = !(bs->open_flags & BDRV_O_RDWR);
if (use_bdrv_whitelist && !bdrv_is_whitelisted(drv, bs->read_only)) { if (use_bdrv_whitelist && !bdrv_is_whitelisted(drv, bs->read_only)) {
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, error_setg(errp,
!bs->read_only && bdrv_is_whitelisted(drv, true) !bs->read_only && bdrv_is_whitelisted(drv, true)
? "Driver '%s' can only be used for read-only devices" ? "Driver '%s' can only be used for read-only devices"
: "Driver '%s' is not whitelisted", : "Driver '%s' is not whitelisted",
drv->format_name); drv->format_name);
ret = -ENOTSUP;
goto fail_opts; goto fail_opts;
} }
}
/* bdrv_new() and bdrv_close() make it so */ /* bdrv_new() and bdrv_close() make it so */
assert(atomic_read(&bs->copy_on_read) == 0); assert(atomic_read(&bs->copy_on_read) == 0);