{"id":807780,"url":"http://patchwork.ozlabs.org/api/1.0/patches/807780/?format=json","project":{"id":14,"url":"http://patchwork.ozlabs.org/api/1.0/projects/14/?format=json","name":"QEMU Development","link_name":"qemu-devel","list_id":"qemu-devel.nongnu.org","list_email":"qemu-devel@nongnu.org","web_url":"","scm_url":"","webscm_url":""},"msgid":"<6ea11ae43c681181f86193352ef3527ff3f64f68.1504112061.git.jcody@redhat.com>","date":"2017-08-30T16:57:02","name":"[v2,5/7] block/curl: check error return of curl_global_init()","commit_ref":null,"pull_url":null,"state":"new","archived":false,"hash":"18fc3a4ac1f9da783b19b73840cf793cd5a84042","submitter":{"id":12159,"url":"http://patchwork.ozlabs.org/api/1.0/people/12159/?format=json","name":"Jeff Cody","email":"jcody@redhat.com"},"delegate":null,"mbox":"http://patchwork.ozlabs.org/project/qemu-devel/patch/6ea11ae43c681181f86193352ef3527ff3f64f68.1504112061.git.jcody@redhat.com/mbox/","series":[{"id":664,"url":"http://patchwork.ozlabs.org/api/1.0/series/664/?format=json","date":"2017-08-30T16:56:58","name":"Code cleanup and minor fixes","version":2,"mbox":"http://patchwork.ozlabs.org/series/664/mbox/"}],"check":"pending","checks":"http://patchwork.ozlabs.org/api/patches/807780/checks/","tags":{},"headers":{"Return-Path":"","X-Original-To":"incoming@patchwork.ozlabs.org","Delivered-To":"patchwork-incoming@bilbo.ozlabs.org","Authentication-Results":["ozlabs.org;\n\tspf=pass (mailfrom) smtp.mailfrom=nongnu.org\n\t(client-ip=2001:4830:134:3::11; helo=lists.gnu.org;\n\tenvelope-from=qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org;\n\treceiver=)","ext-mx07.extmail.prod.ext.phx2.redhat.com;\n\tdmarc=none (p=none dis=none) header.from=redhat.com","ext-mx07.extmail.prod.ext.phx2.redhat.com;\n\tspf=fail smtp.mailfrom=jcody@redhat.com"],"Received":["from lists.gnu.org (lists.gnu.org [IPv6:2001:4830:134:3::11])\n\t(using TLSv1 with cipher AES256-SHA (256/256 bits))\n\t(No client certificate requested)\n\tby ozlabs.org (Postfix) with ESMTPS id 3xjC8d36Yfz9sN7\n\tfor ;\n\tThu, 31 Aug 2017 03:26:09 +1000 (AEST)","from localhost ([::1]:51767 helo=lists.gnu.org)\n\tby lists.gnu.org with esmtp (Exim 4.71) (envelope-from\n\t)\n\tid 1dn6kh-0006Lb-4J\n\tfor incoming@patchwork.ozlabs.org; Wed, 30 Aug 2017 13:26:07 -0400","from eggs.gnu.org ([2001:4830:134:3::10]:58398)\n\tby lists.gnu.org with esmtp (Exim 4.71)\n\t(envelope-from ) id 1dn6Ik-0005V7-QE\n\tfor qemu-devel@nongnu.org; Wed, 30 Aug 2017 12:57:15 -0400","from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71)\n\t(envelope-from ) id 1dn6Ik-0006qR-0B\n\tfor qemu-devel@nongnu.org; Wed, 30 Aug 2017 12:57:14 -0400","from mx1.redhat.com ([209.132.183.28]:49780)\n\tby eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32)\n\t(Exim 4.71) (envelope-from )\n\tid 1dn6Ih-0006nj-PP; Wed, 30 Aug 2017 12:57:11 -0400","from smtp.corp.redhat.com\n\t(int-mx01.intmail.prod.int.phx2.redhat.com [10.5.11.11])\n\t(using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits))\n\t(No client certificate requested)\n\tby mx1.redhat.com (Postfix) with ESMTPS id AC54EC04B938;\n\tWed, 30 Aug 2017 16:57:10 +0000 (UTC)","from localhost (ovpn-116-70.phx2.redhat.com [10.3.116.70])\n\tby smtp.corp.redhat.com (Postfix) with ESMTPS id 7F12D8F341;\n\tWed, 30 Aug 2017 16:57:10 +0000 (UTC)"],"DMARC-Filter":"OpenDMARC Filter v1.3.2 mx1.redhat.com AC54EC04B938","From":"Jeff Cody ","To":"qemu-devel@nongnu.org","Date":"Wed, 30 Aug 2017 12:57:02 -0400","Message-Id":"<6ea11ae43c681181f86193352ef3527ff3f64f68.1504112061.git.jcody@redhat.com>","In-Reply-To":["",""],"References":["",""],"X-Scanned-By":"MIMEDefang 2.79 on 10.5.11.11","X-Greylist":"Sender IP whitelisted, not delayed by milter-greylist-4.5.16\n\t(mx1.redhat.com [10.5.110.31]);\n\tWed, 30 Aug 2017 16:57:10 +0000 (UTC)","X-detected-operating-system":"by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic]\n\t[fuzzy]","X-Received-From":"209.132.183.28","Subject":"[Qemu-devel] [PATCH v2 5/7] block/curl: check error return of\n\tcurl_global_init()","X-BeenThere":"qemu-devel@nongnu.org","X-Mailman-Version":"2.1.21","Precedence":"list","List-Id":"","List-Unsubscribe":",\n\t","List-Archive":"","List-Post":"","List-Help":"","List-Subscribe":",\n\t","Cc":"mitake.hitoshi@lab.ntt.co.jp, namei.unix@gmail.com, kwolf@redhat.com,\n\trjones@redhat.com, qemu-block@nongnu.org","Errors-To":"qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org","Sender":"\"Qemu-devel\"\n\t"},"content":"If curl_global_init() fails, per the documentation no other curl\nfunctions may be called, so make sure to check the return value.\n\nAlso, some minor changes to the initialization latch variable 'inited':\n\n- Make it static in the file, for clarity\n- Change the name for clarity\n- Make it a bool\n\nSigned-off-by: Jeff Cody \n---\n block/curl.c | 18 ++++++++++++------\n 1 file changed, 12 insertions(+), 6 deletions(-)","diff":"diff --git a/block/curl.c b/block/curl.c\nindex 2a244e2..00a9879 100644\n--- a/block/curl.c\n+++ b/block/curl.c\n@@ -89,6 +89,8 @@ static CURLMcode __curl_multi_socket_action(CURLM *multi_handle,\n \n struct BDRVCURLState;\n \n+static bool libcurl_initialized;\n+\n typedef struct CURLAIOCB {\n Coroutine *co;\n QEMUIOVector *qiov;\n@@ -686,14 +688,23 @@ static int curl_open(BlockDriverState *bs, QDict *options, int flags,\n double d;\n const char *secretid;\n const char *protocol_delimiter;\n+ int ret;\n \n- static int inited = 0;\n \n if (flags & BDRV_O_RDWR) {\n error_setg(errp, \"curl block device does not support writes\");\n return -EROFS;\n }\n \n+ if (!libcurl_initialized) {\n+ ret = curl_global_init(CURL_GLOBAL_ALL);\n+ if (ret) {\n+ error_setg(errp, \"libcurl initialization failed with %d\", ret);\n+ return -EIO;\n+ }\n+ libcurl_initialized = true;\n+ }\n+\n qemu_mutex_init(&s->mutex);\n opts = qemu_opts_create(&runtime_opts, NULL, 0, &error_abort);\n qemu_opts_absorb_qdict(opts, options, &local_err);\n@@ -772,11 +783,6 @@ static int curl_open(BlockDriverState *bs, QDict *options, int flags,\n }\n }\n \n- if (!inited) {\n- curl_global_init(CURL_GLOBAL_ALL);\n- inited = 1;\n- }\n-\n DPRINTF(\"CURL: Opening %s\\n\", file);\n QSIMPLEQ_INIT(&s->free_state_waitq);\n s->aio_context = bdrv_get_aio_context(bs);\n","prefixes":["v2","5/7"]}