[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH for-2.9] block/curl: Prefer URL in options over file
From: |
Max Reitz |
Subject: |
[Qemu-devel] [PATCH for-2.9] block/curl: Prefer URL in options over filename |
Date: |
Sun, 27 Nov 2016 00:54:05 +0100 |
Currently, the curl block driver will replace any URL specified through
the options QDict by a filename, if one has been given. However, the
options QDict should generally take precedence, which is implemented by
this patch.
Signed-off-by: Max Reitz <address@hidden>
---
Not really critical, so getting this into 2.9 is sufficient.
---
block/curl.c | 4 +++-
1 file changed, 3 insertions(+), 1 deletion(-)
diff --git a/block/curl.c b/block/curl.c
index 0404c1b..2e9a45c 100644
--- a/block/curl.c
+++ b/block/curl.c
@@ -531,7 +531,9 @@ static void curl_clean_state(CURLState *s)
static void curl_parse_filename(const char *filename, QDict *options,
Error **errp)
{
- qdict_put(options, CURL_BLOCK_OPT_URL, qstring_from_str(filename));
+ if (!qdict_haskey(options, CURL_BLOCK_OPT_URL)) {
+ qdict_put(options, CURL_BLOCK_OPT_URL, qstring_from_str(filename));
+ }
}
static void curl_detach_aio_context(BlockDriverState *bs)
--
2.10.2
- [Qemu-devel] [PATCH for-2.9] block/curl: Prefer URL in options over filename,
Max Reitz <=