From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:48441) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1XtfKp-0002ay-MC for qemu-devel@nongnu.org; Wed, 26 Nov 2014 11:21:02 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1XtfKW-0000ns-SR for qemu-devel@nongnu.org; Wed, 26 Nov 2014 11:20:55 -0500 Received: from mx1.redhat.com ([209.132.183.28]:39767) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1XtfKW-0000ln-CR for qemu-devel@nongnu.org; Wed, 26 Nov 2014 11:20:36 -0500 Received: from int-mx11.intmail.prod.int.phx2.redhat.com (int-mx11.intmail.prod.int.phx2.redhat.com [10.5.11.24]) by mx1.redhat.com (8.14.4/8.14.4) with ESMTP id sAQGKZU9019633 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-GCM-SHA384 bits=256 verify=FAIL) for ; Wed, 26 Nov 2014 11:20:36 -0500 From: Max Reitz Date: Wed, 26 Nov 2014 17:20:25 +0100 Message-Id: <1417018829-15002-3-git-send-email-mreitz@redhat.com> In-Reply-To: <1417018829-15002-1-git-send-email-mreitz@redhat.com> References: <1417018829-15002-1-git-send-email-mreitz@redhat.com> Subject: [Qemu-devel] [PATCH v4 2/6] block: Get full backing filename from string List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Cc: Kevin Wolf , Fam Zheng , Stefan Hajnoczi , Max Reitz Introduce bdrv_get_full_backing_filename_from_filename(), a function which takes the name of the backed file and a potentially relative backing filename to produce the full (absolute) backing filename. Use this function from bdrv_get_full_backing_filename(). Signed-off-by: Max Reitz Reviewed-by: Kevin Wolf Reviewed-by: Eric Blake Reviewed-by: Fam Zheng --- block.c | 16 ++++++++++++---- include/block/block.h | 3 +++ 2 files changed, 15 insertions(+), 4 deletions(-) diff --git a/block.c b/block.c index 866c8b4..0c1be37 100644 --- a/block.c +++ b/block.c @@ -303,15 +303,23 @@ void path_combine(char *dest, int dest_size, } } -void bdrv_get_full_backing_filename(BlockDriverState *bs, char *dest, size_t sz) +void bdrv_get_full_backing_filename_from_filename(const char *backed, + const char *backing, + char *dest, size_t sz) { - if (bs->backing_file[0] == '\0' || path_has_protocol(bs->backing_file)) { - pstrcpy(dest, sz, bs->backing_file); + if (backing[0] == '\0' || path_has_protocol(backing)) { + pstrcpy(dest, sz, backing); } else { - path_combine(dest, sz, bs->filename, bs->backing_file); + path_combine(dest, sz, backed, backing); } } +void bdrv_get_full_backing_filename(BlockDriverState *bs, char *dest, size_t sz) +{ + bdrv_get_full_backing_filename_from_filename(bs->filename, bs->backing_file, + dest, sz); +} + void bdrv_register(BlockDriver *bdrv) { /* Block drivers without coroutine functions need emulation */ diff --git a/include/block/block.h b/include/block/block.h index 610be9f..1c7ecaa 100644 --- a/include/block/block.h +++ b/include/block/block.h @@ -399,6 +399,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); +void bdrv_get_full_backing_filename_from_filename(const char *backed, + const char *backing, + char *dest, size_t sz); int bdrv_is_snapshot(BlockDriverState *bs); int path_is_absolute(const char *path); -- 1.9.3