Received: from eggs.gnu.org ([209.51.188.92]:47504) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1gpeXT-0007Ed-6p for qemu-devel@nongnu.org; Fri, 01 Feb 2019 14:31:48 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1gpeXR-0003Et-8E for qemu-devel@nongnu.org; Fri, 01 Feb 2019 14:31:46 -0500 From: Max Reitz Date: Fri, 1 Feb 2019 20:29:29 +0100 Message-Id: <20190201192935.18394-26-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 25/31] block: Do not copy exact_filename from format file 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 If a format BDS's file BDS is in turn a format BDS, we cannot simply use the same filename, because when opening a BDS tree based on a filename alone, qemu will create only one format node on top of one protocol node (disregarding a potential backing file). Signed-off-by: Max Reitz Reviewed-by: Alberto Garcia --- block.c | 18 +++++++++++++++--- 1 file changed, 15 insertions(+), 3 deletions(-) diff --git a/block.c b/block.c index 7ddf8e3685..c9a6cf0440 100644 --- a/block.c +++ b/block.c @@ -5670,9 +5670,21 @@ void bdrv_refresh_filename(BlockDriverState *bs) =20 bs->exact_filename[0] =3D '\0'; =20 - /* If no specific options have been given for this BDS, the file= name of - * the underlying file should suffice for this one as well */ - if (bs->file->bs->exact_filename[0] && !generate_json_filename) = { + /* + * We can use the underlying file's filename if: + * - it has a filename, + * - the file is a protocol BDS, and + * - opening that file (as this BDS's format) will automatically= create + * the BDS tree we have right now, that is: + * - the user did not significantly change this BDS's behavior= with + * some explicit (strong) options + * - no non-file child of this BDS has been overridden by the = user + * Both of these conditions are represented by generate_json_f= ilename. + */ + if (bs->file->bs->exact_filename[0] && + bs->file->bs->drv->bdrv_file_open && + !generate_json_filename) + { strcpy(bs->exact_filename, bs->file->bs->exact_filename); } } --=20 2.20.1