From nobody Thu Dec 18 13:17:56 2025 Delivered-To: importer@patchew.org Received-SPF: pass (zoho.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.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 209.51.188.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 [209.51.188.17]) by mx.zohomail.com with SMTPS id 1551110238344555.9855933650748; Mon, 25 Feb 2019 07:57:18 -0800 (PST) Received: from localhost ([127.0.0.1]:39565 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1gyId0-00048d-AA for importer@patchew.org; Mon, 25 Feb 2019 10:57:14 -0500 Received: from eggs.gnu.org ([209.51.188.92]:37958) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1gyI5G-0000iP-P7 for qemu-devel@nongnu.org; Mon, 25 Feb 2019 10:22:24 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1gyI5C-0001MQ-V2 for qemu-devel@nongnu.org; Mon, 25 Feb 2019 10:22:22 -0500 Received: from mx1.redhat.com ([209.132.183.28]:52188) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1gyI55-00018c-Pq; Mon, 25 Feb 2019 10:22:12 -0500 Received: from smtp.corp.redhat.com (int-mx06.intmail.prod.int.phx2.redhat.com [10.5.11.16]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id 961EB3003AF0; Mon, 25 Feb 2019 15:22:07 +0000 (UTC) Received: from linux.fritz.box.com (ovpn-117-243.ams2.redhat.com [10.36.117.243]) by smtp.corp.redhat.com (Postfix) with ESMTP id 862B85C221; Mon, 25 Feb 2019 15:22:06 +0000 (UTC) From: Kevin Wolf To: qemu-block@nongnu.org Date: Mon, 25 Feb 2019 16:20:20 +0100 Message-Id: <20190225152053.15976-39-kwolf@redhat.com> In-Reply-To: <20190225152053.15976-1-kwolf@redhat.com> References: <20190225152053.15976-1-kwolf@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.16 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.45]); Mon, 25 Feb 2019 15:22:07 +0000 (UTC) Content-Transfer-Encoding: quoted-printable X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] X-Received-From: 209.132.183.28 Subject: [Qemu-devel] [PULL 38/71] block: Add bdrv_make_absolute_filename() 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: kwolf@redhat.com, peter.maydell@linaro.org, qemu-devel@nongnu.org Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" Content-Type: text/plain; charset="utf-8" From: Max Reitz 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 Message-id: 20190201192935.18394-13-mreitz@redhat.com Signed-off-by: Max Reitz --- block.c | 27 ++++++++++++++++++++------- 1 file changed, 20 insertions(+), 7 deletions(-) diff --git a/block.c b/block.c index a2203f0cfe..c66cd111e1 100644 --- a/block.c +++ b/block.c @@ -338,16 +338,29 @@ char *bdrv_get_full_backing_filename_from_filename(co= nst 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 **err= p) { - 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 ?: "", er= rp); +} + +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