From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:54457) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1ZPtzK-0001Xs-Nf for qemu-devel@nongnu.org; Thu, 13 Aug 2015 11:00:15 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1ZPtzE-0007bT-Sz for qemu-devel@nongnu.org; Thu, 13 Aug 2015 11:00:14 -0400 Date: Thu, 13 Aug 2015 16:59:56 +0200 From: Kevin Wolf Message-ID: <20150813145956.GD6922@noname.redhat.com> References: <1439394502-23619-1-git-send-email-mreitz@redhat.com> <1439394502-23619-3-git-send-email-mreitz@redhat.com> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <1439394502-23619-3-git-send-email-mreitz@redhat.com> Subject: Re: [Qemu-devel] [PATCH v3 2/5] block: Avoid BlockDriverState.filename List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: Max Reitz Cc: qemu-devel@nongnu.org, qemu-block@nongnu.org Am 12.08.2015 um 17:48 hat Max Reitz geschrieben: > In places which directly pass a filename to the OS, we should not use > the filename field at all but exact_filename instead (although the > former currently equals the latter if that is set). > > In qemu-img's map command, we should be using the filename field; but > since this commit prepares to remove that field, using exact_filename is > fine, too (this is the only user of BlockDriverState.filename which > frequently queries that field). > > Signed-off-by: Max Reitz > diff --git a/qemu-img.c b/qemu-img.c > index 75f4ee4..3d5587a 100644 > --- a/qemu-img.c > +++ b/qemu-img.c > @@ -2155,7 +2155,7 @@ static void dump_map_entry(OutputFormat output_format, MapEntry *e, > } > if ((e->flags & (BDRV_BLOCK_DATA|BDRV_BLOCK_ZERO)) == BDRV_BLOCK_DATA) { > printf("%#-16"PRIx64"%#-16"PRIx64"%#-16"PRIx64"%s\n", > - e->start, e->length, e->offset, e->bs->filename); > + e->start, e->length, e->offset, e->bs->exact_filename); > } > /* This format ignores the distinction between 0, ZERO and ZERO|DATA. > * Modify the flags here to allow more coalescing. Before this patch: $ ./qemu-img map 'json:{"driver":"blkdebug","align":512,"image":{"filename":"/tmp/test.qcow2"}}' Offset Length Mapped to File 0 0x15d100000 0 json:{"image": {"driver": "file", "filename": "/tmp/test.qcow2"}, "driver": "blkdebug", "align": 512} After the patch: $ ./qemu-img map 'json:{"driver":"blkdebug","align":512,"image":{"filename":"/tmp/test.qcow2"}}' Offset Length Mapped to File 0 0x15d100000 0 I don't think we can use bs->exact_filename here. Kevin