]> www.infradead.org Git - users/dwmw2/qemu.git/commitdiff
iscsi: Support auto-read-only option
authorKevin Wolf <kwolf@redhat.com>
Mon, 8 Oct 2018 15:27:18 +0000 (17:27 +0200)
committerKevin Wolf <kwolf@redhat.com>
Mon, 5 Nov 2018 14:09:55 +0000 (15:09 +0100)
If read-only=off, but auto-read-only=on 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 <kwolf@redhat.com>
Reviewed-by: Eric Blake <eblake@redhat.com>
block/iscsi.c

index 73998c28607eae45228cb3d8df998ff3d968ea8b..727dee50bf8a73de0f314d3c95fb73f1c913fa37 100644 (file)
@@ -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 == TYPE_DISK && (flags & BDRV_O_RDWR) &&
         iscsilun->write_protected) {
-        error_setg(errp, "Cannot open a write protected LUN as read-write");
-        ret = -EACCES;
-        goto out;
+        ret = bdrv_apply_auto_read_only(bs, "LUN is write protected", errp);
+        if (ret < 0) {
+            goto out;
+        }
+        flags &= ~BDRV_O_RDWR;
     }
 
     iscsi_readcapacity_sync(iscsilun, &local_err);