From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:40425) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1VRQnm-0004fm-ST for qemu-devel@nongnu.org; Wed, 02 Oct 2013 14:05:41 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1VRQng-00049Z-5R for qemu-devel@nongnu.org; Wed, 02 Oct 2013 14:05:34 -0400 Received: from [221.122.32.18] (port=28505 helo=hdr245) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1VRQnf-00049E-58 for qemu-devel@nongnu.org; Wed, 02 Oct 2013 14:05:28 -0400 From: Dunrong Huang Date: Thu, 3 Oct 2013 01:31:27 +0800 Message-Id: <1380735087-16406-1-git-send-email-riegamaths@gmail.com> Subject: [Qemu-devel] [PATCH] block: use correct filename List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel Cc: Kevin Wolf , Stefan Hajnoczi The content filename point to may be erased by qemu_opts_absorb_qdict() in raw_open_common() in drv->bdrv_file_open() So it's better to use bs->filename. Signed-off-by: Dunrong Huang --- block.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/block.c b/block.c index 93e113a..469d842 100644 --- a/block.c +++ b/block.c @@ -824,8 +824,8 @@ static int bdrv_open_common(BlockDriverState *bs, BlockDriverState *file, #ifndef _WIN32 if (bs->is_temporary) { - assert(filename != NULL); - unlink(filename); + assert(bs->filename[0] != '\0'); + unlink(bs->filename); } #endif return 0; -- 1.7.12.4 (Apple Git-37)