{"id":807773,"url":"http://patchwork.ozlabs.org/api/1.0/patches/807773/?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":"","date":"2017-08-30T16:56:58","name":"[v2,1/7] block/ssh: don't call libssh2_init() in block_init()","commit_ref":null,"pull_url":null,"state":"new","archived":false,"hash":"72408c925346dfab13926d7229404efc5031b0c6","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/af4268153bce149a9599e4079a0f8908e32fdef8.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/807773/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-mx02.extmail.prod.ext.phx2.redhat.com;\n\tdmarc=none (p=none dis=none) header.from=redhat.com","ext-mx02.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 3xjC5b4pb7z9sN5\n\tfor ;\n\tThu, 31 Aug 2017 03:23:31 +1000 (AEST)","from localhost ([::1]:51753 helo=lists.gnu.org)\n\tby lists.gnu.org with esmtp (Exim 4.71) (envelope-from\n\t)\n\tid 1dn6i9-0003Lk-CK\n\tfor incoming@patchwork.ozlabs.org; Wed, 30 Aug 2017 13:23:29 -0400","from eggs.gnu.org ([2001:4830:134:3::10]:58354)\n\tby lists.gnu.org with esmtp (Exim 4.71)\n\t(envelope-from ) id 1dn6Ij-0005TE-JQ\n\tfor qemu-devel@nongnu.org; Wed, 30 Aug 2017 12:57:14 -0400","from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71)\n\t(envelope-from ) id 1dn6Ii-0006pF-QW\n\tfor qemu-devel@nongnu.org; Wed, 30 Aug 2017 12:57:13 -0400","from mx1.redhat.com ([209.132.183.28]:55190)\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 1dn6Ie-0006mK-AY; Wed, 30 Aug 2017 12:57:08 -0400","from smtp.corp.redhat.com\n\t(int-mx04.intmail.prod.int.phx2.redhat.com [10.5.11.14])\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 0E22E883BA;\n\tWed, 30 Aug 2017 16:57:07 +0000 (UTC)","from localhost (ovpn-116-70.phx2.redhat.com [10.3.116.70])\n\tby smtp.corp.redhat.com (Postfix) with ESMTPS id D11A75D722;\n\tWed, 30 Aug 2017 16:57:06 +0000 (UTC)"],"DMARC-Filter":"OpenDMARC Filter v1.3.2 mx1.redhat.com 0E22E883BA","From":"Jeff Cody ","To":"qemu-devel@nongnu.org","Date":"Wed, 30 Aug 2017 12:56:58 -0400","Message-Id":"","In-Reply-To":["",""],"References":["",""],"X-Scanned-By":"MIMEDefang 2.79 on 10.5.11.14","X-Greylist":"Sender IP whitelisted, not delayed by milter-greylist-4.5.16\n\t(mx1.redhat.com [10.5.110.26]);\n\tWed, 30 Aug 2017 16:57:07 +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 1/7] block/ssh: don't call libssh2_init() in\n\tblock_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":"We don't need libssh2 failure to be fatal (we could just opt to not\nregister the driver on failure). But, it is probably a good idea to\navoid external library calls during the block_init(), and call the\nlibssh2 global init function on the first usage, returning any errors.\n\nSigned-off-by: Jeff Cody \n---\n block/ssh.c | 40 +++++++++++++++++++++++++++++-----------\n 1 file changed, 29 insertions(+), 11 deletions(-)","diff":"diff --git a/block/ssh.c b/block/ssh.c\nindex e8f0404..cbb0e34 100644\n--- a/block/ssh.c\n+++ b/block/ssh.c\n@@ -83,12 +83,28 @@ typedef struct BDRVSSHState {\n bool unsafe_flush_warning;\n } BDRVSSHState;\n \n-static void ssh_state_init(BDRVSSHState *s)\n+static bool ssh_libinit_called;\n+\n+static int ssh_state_init(BDRVSSHState *s, Error **errp)\n {\n+ int ret;\n+\n+ if (!ssh_libinit_called) {\n+ ret = libssh2_init(0);\n+ if (ret) {\n+ error_setg(errp, \"libssh2 initialization failed with %d\", ret);\n+ return ret;\n+ }\n+ ssh_libinit_called = true;\n+ }\n+\n+\n memset(s, 0, sizeof *s);\n s->sock = -1;\n s->offset = -1;\n qemu_co_mutex_init(&s->lock);\n+\n+ return 0;\n }\n \n static void ssh_state_free(BDRVSSHState *s)\n@@ -772,8 +788,13 @@ static int ssh_file_open(BlockDriverState *bs, QDict *options, int bdrv_flags,\n BDRVSSHState *s = bs->opaque;\n int ret;\n int ssh_flags;\n+ Error *local_err = NULL;\n \n- ssh_state_init(s);\n+ ret = ssh_state_init(s, &local_err);\n+ if (local_err) {\n+ error_propagate(errp, local_err);\n+ return ret;\n+ }\n \n ssh_flags = LIBSSH2_FXF_READ;\n if (bdrv_flags & BDRV_O_RDWR) {\n@@ -821,8 +842,13 @@ static int ssh_create(const char *filename, QemuOpts *opts, Error **errp)\n BDRVSSHState s;\n ssize_t r2;\n char c[1] = { '\\0' };\n+ Error *local_err = NULL;\n \n- ssh_state_init(&s);\n+ ret = ssh_state_init(&s, &local_err);\n+ if (local_err) {\n+ error_propagate(errp, local_err);\n+ return ret;\n+ }\n \n /* Get desired file size. */\n total_size = ROUND_UP(qemu_opt_get_size_del(opts, BLOCK_OPT_SIZE, 0),\n@@ -1213,14 +1239,6 @@ static BlockDriver bdrv_ssh = {\n \n static void bdrv_ssh_init(void)\n {\n- int r;\n-\n- r = libssh2_init(0);\n- if (r != 0) {\n- fprintf(stderr, \"libssh2 initialization failed, %d\\n\", r);\n- exit(EXIT_FAILURE);\n- }\n-\n bdrv_register(&bdrv_ssh);\n }\n \n","prefixes":["v2","1/7"]}