commit d4cea8dfb99153803164915c7a1109549ad3da9c
author Dunrong Huang <riegamaths@gmail.com> Thu Oct 03 01:31:27 2013 +0800
committer Stefan Hajnoczi <stefanha@redhat.com> Mon Oct 07 13:23:19 2013 +0200
tree 36f1e04b40596f3ef157a329800c9d95dcc61334
parent 5c1fa87708d5f226bfd96e8eef8c905fb6895ae3

block: use correct filename

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 <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 e2d9936..d7ca37e 100644
--- a/block.c
+++ b/block.c
@@ -824,8 +824,8 @@
 
 #ifndef _WIN32
     if (bs->is_temporary) {
-        assert(filename != NULL);
-        unlink(filename);
+        assert(bs->filename[0] != '\0');
+        unlink(bs->filename);
     }
 #endif
     return 0;