|
 |
ae23c9 |
From 94b5efa066c1d0a05e62d9435e203afa431f8909 Mon Sep 17 00:00:00 2001
|
|
|
ae23c9 |
From: Kevin Wolf <kwolf@redhat.com>
|
|
|
ae23c9 |
Date: Thu, 10 Jan 2019 12:44:37 +0000
|
|
|
ae23c9 |
Subject: [PATCH 07/14] curl: Support auto-read-only option
|
|
|
ae23c9 |
|
|
|
ae23c9 |
RH-Author: Kevin Wolf <kwolf@redhat.com>
|
|
|
ae23c9 |
Message-id: <20190110124442.30132-8-kwolf@redhat.com>
|
|
|
ae23c9 |
Patchwork-id: 83956
|
|
|
ae23c9 |
O-Subject: [RHEL-8.0 qemu-kvm PATCH 07/12] curl: 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, just degrade to
|
|
|
ae23c9 |
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 6ceef36acb11819b255732b1de0ca62885da04bd)
|
|
|
ae23c9 |
Signed-off-by: Kevin Wolf <kwolf@redhat.com>
|
|
|
ae23c9 |
Signed-off-by: Danilo C. L. de Paula <ddepaula@redhat.com>
|
|
|
ae23c9 |
---
|
|
|
ae23c9 |
block/curl.c | 8 ++++----
|
|
|
ae23c9 |
1 file changed, 4 insertions(+), 4 deletions(-)
|
|
|
ae23c9 |
|
|
|
ae23c9 |
diff --git a/block/curl.c b/block/curl.c
|
|
|
ae23c9 |
index 4d28f77..f0df33a 100644
|
|
|
ae23c9 |
--- a/block/curl.c
|
|
|
ae23c9 |
+++ b/block/curl.c
|
|
|
ae23c9 |
@@ -684,10 +684,10 @@ static int curl_open(BlockDriverState *bs, QDict *options, int flags,
|
|
|
ae23c9 |
const char *protocol_delimiter;
|
|
|
ae23c9 |
int ret;
|
|
|
ae23c9 |
|
|
|
ae23c9 |
-
|
|
|
ae23c9 |
- if (flags & BDRV_O_RDWR) {
|
|
|
ae23c9 |
- error_setg(errp, "curl block device does not support writes");
|
|
|
ae23c9 |
- return -EROFS;
|
|
|
ae23c9 |
+ ret = bdrv_apply_auto_read_only(bs, "curl driver does not support writes",
|
|
|
ae23c9 |
+ errp);
|
|
|
ae23c9 |
+ if (ret < 0) {
|
|
|
ae23c9 |
+ return ret;
|
|
|
ae23c9 |
}
|
|
|
ae23c9 |
|
|
|
ae23c9 |
if (!libcurl_initialized) {
|
|
|
ae23c9 |
--
|
|
|
ae23c9 |
1.8.3.1
|
|
|
ae23c9 |
|