From: Dunrong Huang <riegamaths@gmail.com>
Date: Tue, 24 Sep 2013 10:14:01 +0000 (+0800)
Subject: block: use correct filename for error report
X-Git-Tag: qemu-xen-4.5.0-rc1~433^2~5
X-Git-Url: http://xenbits.xensource.com/gitweb?a=commitdiff_plain;h=2fa9aa59cfc472c16309c4e84547aa873423b2f5;p=qemu-upstream-4.5-testing.git

block: use correct filename for error report

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 <riegamaths@gmail.com>
Reviewed-by: Max Reitz <mreitz@redhat.com>
Signed-off-by: Stefan Hajnoczi <stefanha@redhat.com>
---

diff --git a/block.c b/block.c
index 93e113ad7..e2d993622 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");
         }