From patchwork Wed Nov 30 01:18:32 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Max Reitz X-Patchwork-Id: 9453401 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork.web.codeaurora.org (Postfix) with ESMTP id 7E95A6071C for ; Wed, 30 Nov 2016 01:28:50 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 71C60281B7 for ; Wed, 30 Nov 2016 01:28:50 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 66B30283E0; Wed, 30 Nov 2016 01:28:50 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-6.9 required=2.0 tests=BAYES_00,RCVD_IN_DNSWL_HI autolearn=ham version=3.3.1 Received: from lists.gnu.org (lists.gnu.org [208.118.235.17]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (No client certificate requested) by mail.wl.linuxfoundation.org (Postfix) with ESMTPS id DD787281B7 for ; Wed, 30 Nov 2016 01:28:49 +0000 (UTC) Received: from localhost ([::1]:40184 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1cBthY-00079E-Nc for patchwork-qemu-devel@patchwork.kernel.org; Tue, 29 Nov 2016 20:28:48 -0500 Received: from eggs.gnu.org ([2001:4830:134:3::10]:54284) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1cBtYK-0007jI-Ud for qemu-devel@nongnu.org; Tue, 29 Nov 2016 20:19:18 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1cBtYJ-0006Ad-Ts for qemu-devel@nongnu.org; Tue, 29 Nov 2016 20:19:17 -0500 Received: from mx1.redhat.com ([209.132.183.28]:58122) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1cBtYE-00064j-8N; Tue, 29 Nov 2016 20:19:10 -0500 Received: from int-mx13.intmail.prod.int.phx2.redhat.com (int-mx13.intmail.prod.int.phx2.redhat.com [10.5.11.26]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id 760A33D958; Wed, 30 Nov 2016 01:19:09 +0000 (UTC) Received: from localhost (ovpn-116-36.phx2.redhat.com [10.3.116.36]) by int-mx13.intmail.prod.int.phx2.redhat.com (8.14.4/8.14.4) with ESMTP id uAU1J7CO019495 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-GCM-SHA384 bits=256 verify=NO); Tue, 29 Nov 2016 20:19:09 -0500 From: Max Reitz To: qemu-block@nongnu.org Date: Wed, 30 Nov 2016 02:18:32 +0100 Message-Id: <20161130011851.24696-7-mreitz@redhat.com> In-Reply-To: <20161130011851.24696-1-mreitz@redhat.com> References: <20161130011851.24696-1-mreitz@redhat.com> X-Scanned-By: MIMEDefang 2.68 on 10.5.11.26 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.30]); Wed, 30 Nov 2016 01:19:09 +0000 (UTC) X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] [fuzzy] X-Received-From: 209.132.183.28 Subject: [Qemu-devel] [PATCH v3 06/25] block: bdrv_get_full_backing_filename_from_...'s ret. val. 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 , Alberto Garcia , qemu-devel@nongnu.org, Max Reitz Errors-To: qemu-devel-bounces+patchwork-qemu-devel=patchwork.kernel.org@nongnu.org Sender: "Qemu-devel" X-Virus-Scanned: ClamAV using ClamSMTP Make bdrv_get_full_backing_filename_from_filename() return an allocated string instead of placing the result in a caller-provided buffer. Signed-off-by: Max Reitz Reviewed-by: Alberto Garcia --- block.c | 32 +++++++++++++++++++------------- block/vmdk.c | 8 +++----- include/block/block.h | 7 +++---- 3 files changed, 25 insertions(+), 22 deletions(-) diff --git a/block.c b/block.c index 28ce42c..b02e492 100644 --- a/block.c +++ b/block.c @@ -203,20 +203,20 @@ static void path_combine_deprecated(char *dest, int dest_size, g_free(combined); } -void bdrv_get_full_backing_filename_from_filename(const char *backed, - const char *backing, - char *dest, size_t sz, - Error **errp) +char *bdrv_get_full_backing_filename_from_filename(const char *backed, + const char *backing, + Error **errp) { if (backing[0] == '\0' || path_has_protocol(backing) || path_is_absolute(backing)) { - pstrcpy(dest, sz, backing); + return g_strdup(backing); } else if (backed[0] == '\0' || strstart(backed, "json:", NULL)) { error_setg(errp, "Cannot use relative backing file names for '%s'", backed); + return NULL; } else { - path_combine_deprecated(dest, sz, backed, backing); + return path_combine(backed, backing); } } @@ -224,9 +224,15 @@ void bdrv_get_full_backing_filename(BlockDriverState *bs, char *dest, size_t sz, Error **errp) { char *backed = bs->exact_filename[0] ? bs->exact_filename : bs->filename; + char *full_name; - bdrv_get_full_backing_filename_from_filename(backed, bs->backing_file, - dest, sz, errp); + full_name = bdrv_get_full_backing_filename_from_filename(backed, + bs->backing_file, + errp); + if (full_name) { + pstrcpy(dest, sz, full_name); + g_free(full_name); + } } void bdrv_register(BlockDriver *bdrv) @@ -3607,16 +3613,16 @@ void bdrv_img_create(const char *filename, const char *fmt, if (size == -1) { if (backing_file) { BlockDriverState *bs; - char *full_backing = g_new0(char, PATH_MAX); + char *full_backing; int64_t size; int back_flags; QDict *backing_options = NULL; - bdrv_get_full_backing_filename_from_filename(filename, backing_file, - full_backing, PATH_MAX, - &local_err); + full_backing = + bdrv_get_full_backing_filename_from_filename(filename, + backing_file, + &local_err); if (local_err) { - g_free(full_backing); goto out; } diff --git a/block/vmdk.c b/block/vmdk.c index aad2d7d..6f6932a 100644 --- a/block/vmdk.c +++ b/block/vmdk.c @@ -1973,12 +1973,10 @@ static int vmdk_create(const char *filename, QemuOpts *opts, Error **errp) } if (backing_file) { BlockBackend *blk; - char *full_backing = g_new0(char, PATH_MAX); - bdrv_get_full_backing_filename_from_filename(filename, backing_file, - full_backing, PATH_MAX, - &local_err); + char *full_backing = + bdrv_get_full_backing_filename_from_filename(filename, backing_file, + &local_err); if (local_err) { - g_free(full_backing); error_propagate(errp, local_err); ret = -ENOENT; goto exit; diff --git a/include/block/block.h b/include/block/block.h index 6e5d4b2..fe16e45 100644 --- a/include/block/block.h +++ b/include/block/block.h @@ -437,10 +437,9 @@ void bdrv_get_backing_filename(BlockDriverState *bs, char *filename, int filename_size); void bdrv_get_full_backing_filename(BlockDriverState *bs, char *dest, size_t sz, Error **errp); -void bdrv_get_full_backing_filename_from_filename(const char *backed, - const char *backing, - char *dest, size_t sz, - Error **errp); +char *bdrv_get_full_backing_filename_from_filename(const char *backed, + const char *backing, + Error **errp); int path_has_protocol(const char *path); int path_is_absolute(const char *path);