From fa7a2c6b323882bb64d0015b842f05d6078bbe48 Mon Sep 17 00:00:00 2001 From: Kevin Wolf Date: Wed, 20 Feb 2019 10:37:05 +0000 Subject: [PATCH] block: Apply auto-read-only for ro-whitelist drivers RH-Author: Kevin Wolf Message-id: <20190220103705.22630-2-kwolf@redhat.com> Patchwork-id: 84561 O-Subject: [RHEL-8.0/AV qemu-kvm PATCH 1/1] block: Apply auto-read-only for ro-whitelist drivers Bugzilla: 1678968 RH-Acked-by: Stefan Hajnoczi RH-Acked-by: Max Reitz RH-Acked-by: Stefano Garzarella 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 Reviewed-by: Eric Blake Reviewed-by: Stefan Hajnoczi (cherry picked from commit 8be25de64315ef768353eb61f2b2bf6cddc34230) Signed-off-by: Kevin Wolf Signed-off-by: Danilo C. L. de Paula --- block.c | 20 +++++++++++++------- 1 file changed, 13 insertions(+), 7 deletions(-) diff --git a/block.c b/block.c index 1ec4512..f1f6924 100644 --- a/block.c +++ b/block.c @@ -1442,13 +1442,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 */ -- 1.8.3.1