[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PULL 09/10] block/curl: check error return of curl_global_
From: |
Jeff Cody |
Subject: |
[Qemu-devel] [PULL 09/10] block/curl: check error return of curl_global_init() |
Date: |
Mon, 18 Dec 2017 16:08:18 -0500 |
If curl_global_init() fails, per the documentation no other curl
functions may be called, so make sure to check the return value.
Also, some minor changes to the initialization latch variable 'inited':
- Make it static in the file, for clarity
- Change the name for clarity
- Make it a bool
Signed-off-by: Jeff Cody <address@hidden>
Reviewed-by: Eric Blake <address@hidden>
Reviewed-by: Richard W.M. Jones <address@hidden>
Reviewed-by: Darren Kenny <address@hidden>
Signed-off-by: Jeff Cody <address@hidden>
---
block/curl.c | 18 ++++++++++++------
1 file changed, 12 insertions(+), 6 deletions(-)
diff --git a/block/curl.c b/block/curl.c
index 2a244e2..00a9879 100644
--- a/block/curl.c
+++ b/block/curl.c
@@ -89,6 +89,8 @@ static CURLMcode __curl_multi_socket_action(CURLM
*multi_handle,
struct BDRVCURLState;
+static bool libcurl_initialized;
+
typedef struct CURLAIOCB {
Coroutine *co;
QEMUIOVector *qiov;
@@ -686,14 +688,23 @@ static int curl_open(BlockDriverState *bs, QDict
*options, int flags,
double d;
const char *secretid;
const char *protocol_delimiter;
+ int ret;
- static int inited = 0;
if (flags & BDRV_O_RDWR) {
error_setg(errp, "curl block device does not support writes");
return -EROFS;
}
+ if (!libcurl_initialized) {
+ ret = curl_global_init(CURL_GLOBAL_ALL);
+ if (ret) {
+ error_setg(errp, "libcurl initialization failed with %d", ret);
+ return -EIO;
+ }
+ libcurl_initialized = true;
+ }
+
qemu_mutex_init(&s->mutex);
opts = qemu_opts_create(&runtime_opts, NULL, 0, &error_abort);
qemu_opts_absorb_qdict(opts, options, &local_err);
@@ -772,11 +783,6 @@ static int curl_open(BlockDriverState *bs, QDict *options,
int flags,
}
}
- if (!inited) {
- curl_global_init(CURL_GLOBAL_ALL);
- inited = 1;
- }
-
DPRINTF("CURL: Opening %s\n", file);
QSIMPLEQ_INIT(&s->free_state_waitq);
s->aio_context = bdrv_get_aio_context(bs);
--
2.9.5
- [Qemu-devel] [PULL 00/10] Block patches, Jeff Cody, 2017/12/18
- [Qemu-devel] [PULL 01/10] hbitmap: add next_zero function, Jeff Cody, 2017/12/18
- [Qemu-devel] [PULL 02/10] backup: move from done_bitmap to copy_bitmap, Jeff Cody, 2017/12/18
- [Qemu-devel] [PULL 03/10] backup: init copy_bitmap from sync_bitmap for incremental, Jeff Cody, 2017/12/18
- [Qemu-devel] [PULL 04/10] backup: simplify non-dirty bits progress processing, Jeff Cody, 2017/12/18
- [Qemu-devel] [PULL 05/10] backup: use copy_bitmap in incremental backup, Jeff Cody, 2017/12/18
- [Qemu-devel] [PULL 06/10] blockjob: kick jobs on set-speed, Jeff Cody, 2017/12/18
- [Qemu-devel] [PULL 07/10] block/sheepdog: remove spurious NULL check, Jeff Cody, 2017/12/18
- [Qemu-devel] [PULL 09/10] block/curl: check error return of curl_global_init(),
Jeff Cody <=
- [Qemu-devel] [PULL 08/10] block/sheepdog: code beautification, Jeff Cody, 2017/12/18
- [Qemu-devel] [PULL 10/10] block/curl: fix minor memory leaks, Jeff Cody, 2017/12/18
- Re: [Qemu-devel] [PULL 00/10] Block patches, Peter Maydell, 2017/12/19