From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:34164) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1VOPdJ-00025o-AC for qemu-devel@nongnu.org; Tue, 24 Sep 2013 06:14:25 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1VOPd9-0006CH-W9 for qemu-devel@nongnu.org; Tue, 24 Sep 2013 06:14:17 -0400 Received: from mail-pa0-x22f.google.com ([2607:f8b0:400e:c03::22f]:55788) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1VOPd9-0006By-PK for qemu-devel@nongnu.org; Tue, 24 Sep 2013 06:14:07 -0400 Received: by mail-pa0-f47.google.com with SMTP id kp14so3456899pab.20 for ; Tue, 24 Sep 2013 03:14:06 -0700 (PDT) From: Dunrong Huang Date: Tue, 24 Sep 2013 18:14:01 +0800 Message-Id: <1380017641-29820-1-git-send-email-riegamaths@gmail.com> Subject: [Qemu-devel] [PATCH] block: use correct filename for error report 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 will 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 ea4956d..9cd78a1 100644 --- a/block.c +++ b/block.c @@ -808,8 +808,8 @@ static int bdrv_open_common(BlockDriverState *bs, BlockDriverState *file, if (ret < 0) { if (error_is_set(&local_err)) { error_propagate(errp, local_err); - } else if (filename) { - error_setg_errno(errp, -ret, "Could not open '%s'", filename); + } else if (bs->filename[0]) { + error_setg_errno(errp, -ret, "Could not open '%s'", bs->filename); } else { error_setg_errno(errp, -ret, "Could not open image"); } -- 1.8.3.2