From nobody Sat Oct 25 08:47:05 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 1518641501101354.18756909192234; Wed, 14 Feb 2018 12:51:41 -0800 (PST) Received: from localhost ([::1]:58748 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1em41a-0003nV-Pq for importer@patchew.org; Wed, 14 Feb 2018 15:51:30 -0500 Received: from eggs.gnu.org ([2001:4830:134:3::10]:37495) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1em3zk-0002Ik-52 for qemu-devel@nongnu.org; Wed, 14 Feb 2018 15:49:37 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1em3zj-0001v9-BE for qemu-devel@nongnu.org; Wed, 14 Feb 2018 15:49:36 -0500 Received: from mx3-rdu2.redhat.com ([66.187.233.73]:47432 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 1em3ze-0001hF-FI; Wed, 14 Feb 2018 15:49:30 -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 EC92FEAE80; Wed, 14 Feb 2018 20:49:24 +0000 (UTC) Received: from localhost (ovpn-116-101.ams2.redhat.com [10.36.116.101]) by smtp.corp.redhat.com (Postfix) with ESMTPS id A09342024CA4; Wed, 14 Feb 2018 20:49:24 +0000 (UTC) From: Max Reitz To: qemu-block@nongnu.org Date: Wed, 14 Feb 2018 21:49:13 +0100 Message-Id: <20180214204915.7980-2-mreitz@redhat.com> In-Reply-To: <20180214204915.7980-1-mreitz@redhat.com> References: <20180214204915.7980-1-mreitz@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.1]); Wed, 14 Feb 2018 20:49:24 +0000 (UTC) X-Greylist: inspected by milter-greylist-4.5.16 (mx1.redhat.com [10.11.55.1]); Wed, 14 Feb 2018 20:49:24 +0000 (UTC) for IP:'10.11.54.4' DOMAIN:'int-mx04.intmail.prod.int.rdu2.redhat.com' HELO:'smtp.corp.redhat.com' FROM:'mreitz@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 1/3] block/ssh: Pull ssh_grow_file() from ssh_create() 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: Kevin Wolf , "Richard W . M . Jones" , Jeff Cody , qemu-devel@nongnu.org, Max Reitz 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" If we ever want to offer even rudimentary truncation functionality for ssh, we should put the respective code into a reusable function. Signed-off-by: Max Reitz Reviewed-by: Eric Blake --- block/ssh.c | 30 ++++++++++++++++++++++-------- 1 file changed, 22 insertions(+), 8 deletions(-) diff --git a/block/ssh.c b/block/ssh.c index b63addcf94..964e55f7fe 100644 --- a/block/ssh.c +++ b/block/ssh.c @@ -803,6 +803,26 @@ static int ssh_file_open(BlockDriverState *bs, QDict *= options, int bdrv_flags, return ret; } =20 +static int ssh_grow_file(BDRVSSHState *s, int64_t offset, Error **errp) +{ + ssize_t ret; + char c[1] =3D { '\0' }; + + /* offset must be strictly greater than the current size so we do + * not overwrite anything */ + assert(offset > 0 && offset > s->attrs.filesize); + + libssh2_sftp_seek64(s->sftp_handle, offset - 1); + ret =3D libssh2_sftp_write(s->sftp_handle, c, 1); + if (ret < 0) { + sftp_error_setg(errp, s, "Failed to grow file"); + return -EIO; + } + + s->attrs.filesize =3D offset; + return 0; +} + static QemuOptsList ssh_create_opts =3D { .name =3D "ssh-create-opts", .head =3D QTAILQ_HEAD_INITIALIZER(ssh_create_opts.head), @@ -822,8 +842,6 @@ static int ssh_create(const char *filename, QemuOpts *o= pts, Error **errp) int64_t total_size =3D 0; QDict *uri_options =3D NULL; BDRVSSHState s; - ssize_t r2; - char c[1] =3D { '\0' }; =20 ssh_state_init(&s); =20 @@ -849,14 +867,10 @@ static int ssh_create(const char *filename, QemuOpts = *opts, Error **errp) } =20 if (total_size > 0) { - libssh2_sftp_seek64(s.sftp_handle, total_size-1); - r2 =3D libssh2_sftp_write(s.sftp_handle, c, 1); - if (r2 < 0) { - sftp_error_setg(errp, &s, "truncate failed"); - ret =3D -EINVAL; + ret =3D ssh_grow_file(&s, total_size, errp); + if (ret < 0) { goto out; } - s.attrs.filesize =3D total_size; } =20 ret =3D 0; --=20 2.14.3