From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:52913) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1gJhy7-0004zE-CU for qemu-devel@nongnu.org; Mon, 05 Nov 2018 11:43:16 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1gJhy6-0008AQ-6g for qemu-devel@nongnu.org; Mon, 05 Nov 2018 11:43:15 -0500 From: Kevin Wolf Date: Mon, 5 Nov 2018 17:37:35 +0100 Message-Id: <20181105163744.25139-28-kwolf@redhat.com> In-Reply-To: <20181105163744.25139-1-kwolf@redhat.com> References: <20181105163744.25139-1-kwolf@redhat.com> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Subject: [Qemu-devel] [PULL 27/36] iscsi: Support auto-read-only option 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 read-only=3Doff, but auto-read-only=3Don is given, open the volume read-write if we have the permissions, but instead of erroring out for read-only volumes, just degrade to read-only. Signed-off-by: Kevin Wolf Reviewed-by: Eric Blake --- block/iscsi.c | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/block/iscsi.c b/block/iscsi.c index 73998c2860..727dee50bf 100644 --- a/block/iscsi.c +++ b/block/iscsi.c @@ -1878,9 +1878,11 @@ static int iscsi_open(BlockDriverState *bs, QDict = *options, int flags, /* Check the write protect flag of the LUN if we want to write */ if (iscsilun->type =3D=3D TYPE_DISK && (flags & BDRV_O_RDWR) && iscsilun->write_protected) { - error_setg(errp, "Cannot open a write protected LUN as read-writ= e"); - ret =3D -EACCES; - goto out; + ret =3D bdrv_apply_auto_read_only(bs, "LUN is write protected", = errp); + if (ret < 0) { + goto out; + } + flags &=3D ~BDRV_O_RDWR; } =20 iscsi_readcapacity_sync(iscsilun, &local_err); --=20 2.19.1