Received: from eggs.gnu.org ([209.51.188.92]:46931) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1gpeW2-0005zY-Ip for qemu-devel@nongnu.org; Fri, 01 Feb 2019 14:30:21 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1gpeVy-0002dl-Ve for qemu-devel@nongnu.org; Fri, 01 Feb 2019 14:30:16 -0500 From: Max Reitz Date: Fri, 1 Feb 2019 20:29:16 +0100 Message-Id: <20190201192935.18394-13-mreitz@redhat.com> In-Reply-To: <20190201192935.18394-1-mreitz@redhat.com> References: <20190201192935.18394-1-mreitz@redhat.com> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Subject: [Qemu-devel] [PATCH v13 12/31] block: Add bdrv_make_absolute_filename() List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-block@nongnu.org Cc: qemu-devel@nongnu.org, Max Reitz , Kevin Wolf This is a general function for making a filename that is relative to a certain BDS absolute. It calls bdrv_get_full_backing_filename_from_filename() for now, but that will be changed in a follow-up patch. Signed-off-by: Max Reitz Reviewed-by: Alberto Garcia --- block.c | 27 ++++++++++++++++++++------- 1 file changed, 20 insertions(+), 7 deletions(-) diff --git a/block.c b/block.c index ad78344e07..21100ac7fd 100644 --- a/block.c +++ b/block.c @@ -338,16 +338,29 @@ char *bdrv_get_full_backing_filename_from_filename(= const char *backed, } } =20 -char *bdrv_get_full_backing_filename(BlockDriverState *bs, Error **errp) +/* + * If @filename is empty or NULL, this function returns NULL without + * setting @errp. In all other cases, NULL will only be returned with + * @errp set. + */ +static char *bdrv_make_absolute_filename(BlockDriverState *relative_to, + const char *filename, Error **e= rrp) { - char *backed; + char *bs_filename; =20 - bdrv_refresh_filename(bs); + bdrv_refresh_filename(relative_to); + + bs_filename =3D relative_to->exact_filename[0] + ? relative_to->exact_filename + : relative_to->filename; =20 - backed =3D bs->exact_filename[0] ? bs->exact_filename : bs->filename= ; - return bdrv_get_full_backing_filename_from_filename(backed, - bs->backing_file= , - errp); + return bdrv_get_full_backing_filename_from_filename(bs_filename, + filename ?: "", = errp); +} + +char *bdrv_get_full_backing_filename(BlockDriverState *bs, Error **errp) +{ + return bdrv_make_absolute_filename(bs, bs->backing_file, errp); } =20 void bdrv_register(BlockDriver *bdrv) --=20 2.20.1