[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-block] [PATCH for-3.1 v10 28/31] block/curl: Implement bdrv_refres
From: |
Max Reitz |
Subject: |
[Qemu-block] [PATCH for-3.1 v10 28/31] block/curl: Implement bdrv_refresh_filename() |
Date: |
Thu, 9 Aug 2018 23:35:25 +0200 |
Signed-off-by: Max Reitz <address@hidden>
Reviewed-by: Alberto Garcia <address@hidden>
---
block/curl.c | 21 +++++++++++++++++++++
1 file changed, 21 insertions(+)
diff --git a/block/curl.c b/block/curl.c
index 13fca02aba..fcb8ad501b 100644
--- a/block/curl.c
+++ b/block/curl.c
@@ -961,6 +961,23 @@ static int64_t curl_getlength(BlockDriverState *bs)
return s->len;
}
+static void curl_refresh_filename(BlockDriverState *bs)
+{
+ BDRVCURLState *s = bs->opaque;
+
+ /* "readahead" and "timeout" do not change the guest-visible data,
+ * so ignore them */
+ if (s->sslverify != CURL_BLOCK_OPT_SSLVERIFY_DEFAULT ||
+ s->cookie || s->username || s->password || s->proxyusername ||
+ s->proxypassword)
+ {
+ return;
+ }
+
+ pstrcpy(bs->exact_filename, sizeof(bs->exact_filename), s->url);
+}
+
+
static const char *const curl_strong_runtime_opts[] = {
CURL_BLOCK_OPT_URL,
CURL_BLOCK_OPT_SSLVERIFY,
@@ -989,6 +1006,7 @@ static BlockDriver bdrv_http = {
.bdrv_detach_aio_context = curl_detach_aio_context,
.bdrv_attach_aio_context = curl_attach_aio_context,
+ .bdrv_refresh_filename = curl_refresh_filename,
.strong_runtime_opts = curl_strong_runtime_opts,
};
@@ -1007,6 +1025,7 @@ static BlockDriver bdrv_https = {
.bdrv_detach_aio_context = curl_detach_aio_context,
.bdrv_attach_aio_context = curl_attach_aio_context,
+ .bdrv_refresh_filename = curl_refresh_filename,
.strong_runtime_opts = curl_strong_runtime_opts,
};
@@ -1025,6 +1044,7 @@ static BlockDriver bdrv_ftp = {
.bdrv_detach_aio_context = curl_detach_aio_context,
.bdrv_attach_aio_context = curl_attach_aio_context,
+ .bdrv_refresh_filename = curl_refresh_filename,
.strong_runtime_opts = curl_strong_runtime_opts,
};
@@ -1043,6 +1063,7 @@ static BlockDriver bdrv_ftps = {
.bdrv_detach_aio_context = curl_detach_aio_context,
.bdrv_attach_aio_context = curl_attach_aio_context,
+ .bdrv_refresh_filename = curl_refresh_filename,
.strong_runtime_opts = curl_strong_runtime_opts,
};
--
2.17.1
- [Qemu-block] [PATCH for-3.1 v10 23/31] block: Generically refresh runtime options, (continued)
- [Qemu-block] [PATCH for-3.1 v10 23/31] block: Generically refresh runtime options, Max Reitz, 2018/08/09
- [Qemu-block] [PATCH for-3.1 v10 22/31] block: Add BlockDriver.bdrv_gather_child_options, Max Reitz, 2018/08/09
- [Qemu-block] [PATCH for-3.1 v10 25/31] block: Do not copy exact_filename from format file, Max Reitz, 2018/08/09
- [Qemu-block] [PATCH for-3.1 v10 26/31] block/nvme: Fix bdrv_refresh_filename(), Max Reitz, 2018/08/09
- [Qemu-block] [PATCH for-3.1 v10 24/31] block: Purify .bdrv_refresh_filename(), Max Reitz, 2018/08/09
- [Qemu-block] [PATCH for-3.1 v10 27/31] block/curl: Harmonize option defaults, Max Reitz, 2018/08/09
- [Qemu-block] [PATCH for-3.1 v10 29/31] block/null: Generate filename even with latency-ns, Max Reitz, 2018/08/09
- [Qemu-block] [PATCH for-3.1 v10 28/31] block/curl: Implement bdrv_refresh_filename(),
Max Reitz <=
- [Qemu-block] [PATCH for-3.1 v10 30/31] block: BDS options may lack the "driver" option, Max Reitz, 2018/08/09
- [Qemu-block] [PATCH for-3.1 v10 31/31] iotests: Test json:{} filenames of internal BDSs, Max Reitz, 2018/08/09
- Re: [Qemu-block] [Qemu-devel] [PATCH for-3.1 v10 00/31] block: Fix some filename generation issues, no-reply, 2018/08/16