commit 2fa9aa59cfc472c16309c4e84547aa873423b2f5
author Dunrong Huang <riegamaths@gmail.com> Tue Sep 24 18:14:01 2013 +0800
committer Stefan Hajnoczi <stefanha@redhat.com> Wed Oct 02 11:41:50 2013 +0200
tree 2c7df26bd1d6dd9bf3ce315c55cfe81b1aea2d69
parent db0749012b3d1cf655bddb3cc79052a0fd4dc97b

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>

block.c

diff --git a/block.c b/block.c
index 93e113a..e2d9936 100644
--- a/block.c
+++ b/block.c
@@ -808,8 +808,8 @@
     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");
         }