From nobody Fri Oct 24 09:38:24 2025 Delivered-To: importer@patchew.org Received-SPF: pass (zoho.com: domain of gnu.org designates 208.118.235.17 as permitted sender) client-ip=208.118.235.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Authentication-Results: mx.zohomail.com; spf=pass (zoho.com: domain of gnu.org designates 208.118.235.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail(p=none dis=none) header.from=redhat.com Return-Path: Received: from lists.gnu.org (lists.gnu.org [208.118.235.17]) by mx.zohomail.com with SMTPS id 1519415577675608.982929163323; Fri, 23 Feb 2018 11:52:57 -0800 (PST) Received: from localhost ([::1]:46869 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1epJOp-0006zd-Qi for importer@patchew.org; Fri, 23 Feb 2018 14:52:55 -0500 Received: from eggs.gnu.org ([2001:4830:134:3::10]:50592) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1epIzn-0001R6-Gr for qemu-devel@nongnu.org; Fri, 23 Feb 2018 14:27:04 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1epIzm-0005Qq-FF for qemu-devel@nongnu.org; Fri, 23 Feb 2018 14:27:03 -0500 Received: from mx3-rdu2.redhat.com ([66.187.233.73]:50874 helo=mx1.redhat.com) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1epIzg-0005I2-48; Fri, 23 Feb 2018 14:26:56 -0500 Received: from smtp.corp.redhat.com (int-mx04.intmail.prod.int.rdu2.redhat.com [10.11.54.4]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id B67DA8A3DD; Fri, 23 Feb 2018 19:26:55 +0000 (UTC) Received: from localhost.localdomain.com (ovpn-117-118.ams2.redhat.com [10.36.117.118]) by smtp.corp.redhat.com (Postfix) with ESMTP id 2678D2024CAC; Fri, 23 Feb 2018 19:26:54 +0000 (UTC) From: Kevin Wolf To: qemu-block@nongnu.org Date: Fri, 23 Feb 2018 20:25:44 +0100 Message-Id: <20180223192549.26666-32-kwolf@redhat.com> In-Reply-To: <20180223192549.26666-1-kwolf@redhat.com> References: <20180223192549.26666-1-kwolf@redhat.com> X-Scanned-By: MIMEDefang 2.78 on 10.11.54.4 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.11.55.2]); Fri, 23 Feb 2018 19:26:55 +0000 (UTC) X-Greylist: inspected by milter-greylist-4.5.16 (mx1.redhat.com [10.11.55.2]); Fri, 23 Feb 2018 19:26:55 +0000 (UTC) for IP:'10.11.54.4' DOMAIN:'int-mx04.intmail.prod.int.rdu2.redhat.com' HELO:'smtp.corp.redhat.com' FROM:'kwolf@redhat.com' RCPT:'' X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] [fuzzy] X-Received-From: 66.187.233.73 Subject: [Qemu-devel] [PATCH v3 31/36] ssh: Pass BlockdevOptionsSsh to connect_to_ssh() X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: kwolf@redhat.com, jdurgin@redhat.com, pkrempa@redhat.com, mitake.hitoshi@lab.ntt.co.jp, jcody@redhat.com, qemu-devel@nongnu.org, mreitz@redhat.com, namei.unix@gmail.com Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail: RSF_0 Z_629925259 SPT_0 Content-Transfer-Encoding: quoted-printable MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Move the parsing of the QDict options up to the callers, in preparation for the .bdrv_co_create implementation that directly gets a QAPI type. Signed-off-by: Kevin Wolf Reviewed-by: Max Reitz --- block/ssh.c | 34 +++++++++++++++++++++------------- 1 file changed, 21 insertions(+), 13 deletions(-) diff --git a/block/ssh.c b/block/ssh.c index dcf766c213..77bc20041f 100644 --- a/block/ssh.c +++ b/block/ssh.c @@ -655,19 +655,13 @@ fail: return result; } =20 -static int connect_to_ssh(BDRVSSHState *s, QDict *options, +static int connect_to_ssh(BDRVSSHState *s, BlockdevOptionsSsh *opts, int ssh_flags, int creat_mode, Error **errp) { - BlockdevOptionsSsh *opts; int r, ret; const char *user; long port =3D 0; =20 - opts =3D ssh_parse_options(options, errp); - if (opts =3D=3D NULL) { - return -EINVAL; - } - if (opts->has_user) { user =3D opts->user; } else { @@ -747,8 +741,6 @@ static int connect_to_ssh(BDRVSSHState *s, QDict *optio= ns, goto err; } =20 - qapi_free_BlockdevOptionsSsh(opts); - r =3D libssh2_sftp_fstat(s->sftp_handle, &s->attrs); if (r < 0) { sftp_error_setg(errp, s, "failed to read file attributes"); @@ -774,8 +766,6 @@ static int connect_to_ssh(BDRVSSHState *s, QDict *optio= ns, } s->session =3D NULL; =20 - qapi_free_BlockdevOptionsSsh(opts); - return ret; } =20 @@ -783,6 +773,7 @@ static int ssh_file_open(BlockDriverState *bs, QDict *o= ptions, int bdrv_flags, Error **errp) { BDRVSSHState *s =3D bs->opaque; + BlockdevOptionsSsh *opts; int ret; int ssh_flags; =20 @@ -793,8 +784,13 @@ static int ssh_file_open(BlockDriverState *bs, QDict *= options, int bdrv_flags, ssh_flags |=3D LIBSSH2_FXF_WRITE; } =20 + opts =3D ssh_parse_options(options, errp); + if (opts =3D=3D NULL) { + return -EINVAL; + } + /* Start up SSH. */ - ret =3D connect_to_ssh(s, options, ssh_flags, 0, errp); + ret =3D connect_to_ssh(s, opts, ssh_flags, 0, errp); if (ret < 0) { goto err; } @@ -802,6 +798,8 @@ static int ssh_file_open(BlockDriverState *bs, QDict *o= ptions, int bdrv_flags, /* Go non-blocking. */ libssh2_session_set_blocking(s->session, 0); =20 + qapi_free_BlockdevOptionsSsh(opts); + return 0; =20 err: @@ -810,6 +808,8 @@ static int ssh_file_open(BlockDriverState *bs, QDict *o= ptions, int bdrv_flags, } s->sock =3D -1; =20 + qapi_free_BlockdevOptionsSsh(opts); + return ret; } =20 @@ -831,6 +831,7 @@ static int ssh_create(const char *filename, QemuOpts *o= pts, Error **errp) int r, ret; int64_t total_size =3D 0; QDict *uri_options =3D NULL; + BlockdevOptionsSsh *ssh_opts =3D NULL; BDRVSSHState s; ssize_t r2; char c[1] =3D { '\0' }; @@ -849,7 +850,13 @@ static int ssh_create(const char *filename, QemuOpts *= opts, Error **errp) goto out; } =20 - r =3D connect_to_ssh(&s, uri_options, + ssh_opts =3D ssh_parse_options(uri_options, errp); + if (ssh_opts =3D=3D NULL) { + ret =3D -EINVAL; + goto out; + } + + r =3D connect_to_ssh(&s, ssh_opts, LIBSSH2_FXF_READ|LIBSSH2_FXF_WRITE| LIBSSH2_FXF_CREAT|LIBSSH2_FXF_TRUNC, 0644, errp); @@ -876,6 +883,7 @@ static int ssh_create(const char *filename, QemuOpts *o= pts, Error **errp) if (uri_options !=3D NULL) { QDECREF(uri_options); } + qapi_free_BlockdevOptionsSsh(ssh_opts); return ret; } =20 --=20 2.13.6