From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([209.51.188.92]:38953) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1gpbnz-0007eP-KB for qemu-devel@nongnu.org; Fri, 01 Feb 2019 11:36:40 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1gpbnu-0008Q5-0X for qemu-devel@nongnu.org; Fri, 01 Feb 2019 11:36:37 -0500 From: Kevin Wolf Date: Fri, 1 Feb 2019 17:35:07 +0100 Message-Id: <20190201163518.31157-17-kwolf@redhat.com> In-Reply-To: <20190201163518.31157-1-kwolf@redhat.com> References: <20190201163518.31157-1-kwolf@redhat.com> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Subject: [Qemu-devel] [PULL 16/27] block: Apply auto-read-only for ro-whitelist drivers List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-block@nongnu.org Cc: kwolf@redhat.com, peter.maydell@linaro.org, qemu-devel@nongnu.org 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=3Don was set. Consider auto-read-only=3Don 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 --- block.c | 20 +++++++++++++------- 1 file changed, 13 insertions(+), 7 deletions(-) diff --git a/block.c b/block.c index 0c5d1f11a5..5a4d27173e 100644 --- a/block.c +++ b/block.c @@ -1438,13 +1438,19 @@ static int bdrv_open_common(BlockDriverState *bs,= BlockBackend *file, bs->read_only =3D !(bs->open_flags & BDRV_O_RDWR); =20 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 de= vices" - : "Driver '%s' is not whitelisted", - drv->format_name); - ret =3D -ENOTSUP; - goto fail_opts; + if (!bs->read_only && bdrv_is_whitelisted(drv, true)) { + ret =3D bdrv_apply_auto_read_only(bs, NULL, NULL); + } else { + ret =3D -ENOTSUP; + } + if (ret < 0) { + error_setg(errp, + !bs->read_only && bdrv_is_whitelisted(drv, true) + ? "Driver '%s' can only be used for read-only dev= ices" + : "Driver '%s' is not whitelisted", + drv->format_name); + goto fail_opts; + } } =20 /* bdrv_new() and bdrv_close() make it so */ --=20 2.20.1