From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:43420) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Y20WW-0001WY-Uu for qemu-devel@nongnu.org; Fri, 19 Dec 2014 11:35:35 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1Y20WP-0002lc-6V for qemu-devel@nongnu.org; Fri, 19 Dec 2014 11:35:28 -0500 Received: from mx1.redhat.com ([209.132.183.28]:59511) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Y20WO-0002lU-UK for qemu-devel@nongnu.org; Fri, 19 Dec 2014 11:35:21 -0500 Received: from int-mx09.intmail.prod.int.phx2.redhat.com (int-mx09.intmail.prod.int.phx2.redhat.com [10.5.11.22]) by mx1.redhat.com (8.14.4/8.14.4) with ESMTP id sBJGZKKG024562 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-GCM-SHA384 bits=256 verify=FAIL) for ; Fri, 19 Dec 2014 11:35:20 -0500 From: Kevin Wolf Date: Fri, 19 Dec 2014 17:34:58 +0100 Message-Id: <1419006909-1781-9-git-send-email-kwolf@redhat.com> In-Reply-To: <1419006909-1781-1-git-send-email-kwolf@redhat.com> References: <1419006909-1781-1-git-send-email-kwolf@redhat.com> Subject: [Qemu-devel] [PULL 08/19] 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: kwolf@redhat.com From: 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 Signed-off-by: Kevin Wolf --- block.c | 16 ++++++++++++---- include/block/block.h | 3 +++ 2 files changed, 15 insertions(+), 4 deletions(-) diff --git a/block.c b/block.c index 58f8042..86f2faa 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 6e7275d..eac9bb0 100644 --- a/include/block/block.h +++ b/include/block/block.h @@ -397,6 +397,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_has_protocol(const char *path); -- 1.8.3.1