From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:56248) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1cAmnQ-0007dN-E6 for qemu-devel@nongnu.org; Sat, 26 Nov 2016 18:54:17 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1cAmnP-00062I-QU for qemu-devel@nongnu.org; Sat, 26 Nov 2016 18:54:16 -0500 From: Max Reitz Date: Sun, 27 Nov 2016 00:54:05 +0100 Message-Id: <20161126235405.1357-1-mreitz@redhat.com> Subject: [Qemu-devel] [PATCH for-2.9] block/curl: Prefer URL in options over filename List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-block@nongnu.org Cc: qemu-devel@nongnu.org, Max Reitz , Jeff Cody , Kevin Wolf 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 --- 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