yeahuh / rpms / qemu-kvm

Forked from rpms/qemu-kvm 2 years ago
Clone
ae23c9
From 8aff951dc5acb2965131e43e10b1cd9fce17992e Mon Sep 17 00:00:00 2001
ae23c9
From: Kevin Wolf <kwolf@redhat.com>
ae23c9
Date: Thu, 10 Jan 2019 12:44:36 +0000
ae23c9
Subject: [PATCH 06/14] file-posix: Support auto-read-only option
ae23c9
ae23c9
RH-Author: Kevin Wolf <kwolf@redhat.com>
ae23c9
Message-id: <20190110124442.30132-7-kwolf@redhat.com>
ae23c9
Patchwork-id: 83955
ae23c9
O-Subject: [RHEL-8.0 qemu-kvm PATCH 06/12] file-posix: Support auto-read-only option
ae23c9
Bugzilla: 1644996
ae23c9
RH-Acked-by: Max Reitz <mreitz@redhat.com>
ae23c9
RH-Acked-by: Stefan Hajnoczi <stefanha@redhat.com>
ae23c9
RH-Acked-by: Eric Blake <eblake@redhat.com>
ae23c9
ae23c9
If read-only=off, but auto-read-only=on is given, open the file
ae23c9
read-write if we have the permissions, but instead of erroring out for
ae23c9
read-only files, just degrade to read-only.
ae23c9
ae23c9
Signed-off-by: Kevin Wolf <kwolf@redhat.com>
ae23c9
Reviewed-by: Eric Blake <eblake@redhat.com>
ae23c9
(cherry picked from commit 64107dc044a54ebe46348ac0fe87584be2eb3e81)
ae23c9
Signed-off-by: Kevin Wolf <kwolf@redhat.com>
ae23c9
Signed-off-by: Danilo C. L. de Paula <ddepaula@redhat.com>
ae23c9
---
ae23c9
 block/file-posix.c | 19 ++++++++++++++++---
ae23c9
 1 file changed, 16 insertions(+), 3 deletions(-)
ae23c9
ae23c9
diff --git a/block/file-posix.c b/block/file-posix.c
ae23c9
index c12cdb7..7e6869d 100644
ae23c9
--- a/block/file-posix.c
ae23c9
+++ b/block/file-posix.c
ae23c9
@@ -517,9 +517,22 @@ static int raw_open_common(BlockDriverState *bs, QDict *options,
ae23c9
 
ae23c9
     s->fd = -1;
ae23c9
     fd = qemu_open(filename, s->open_flags, 0644);
ae23c9
-    if (fd < 0) {
ae23c9
-        ret = -errno;
ae23c9
-        error_setg_errno(errp, errno, "Could not open '%s'", filename);
ae23c9
+    ret = fd < 0 ? -errno : 0;
ae23c9
+
ae23c9
+    if (ret == -EACCES || ret == -EROFS) {
ae23c9
+        /* Try to degrade to read-only, but if it doesn't work, still use the
ae23c9
+         * normal error message. */
ae23c9
+        if (bdrv_apply_auto_read_only(bs, NULL, NULL) == 0) {
ae23c9
+            bdrv_flags &= ~BDRV_O_RDWR;
ae23c9
+            raw_parse_flags(bdrv_flags, &s->open_flags);
ae23c9
+            assert(!(s->open_flags & O_CREAT));
ae23c9
+            fd = qemu_open(filename, s->open_flags);
ae23c9
+            ret = fd < 0 ? -errno : 0;
ae23c9
+        }
ae23c9
+    }
ae23c9
+
ae23c9
+    if (ret < 0) {
ae23c9
+        error_setg_errno(errp, -ret, "Could not open '%s'", filename);
ae23c9
         if (ret == -EROFS) {
ae23c9
             ret = -EACCES;
ae23c9
         }
ae23c9
-- 
ae23c9
1.8.3.1
ae23c9