OSDN Git Service

block: use correct filename
authorDunrong Huang <riegamaths@gmail.com>
Wed, 2 Oct 2013 17:31:27 +0000 (01:31 +0800)
committerStefan Hajnoczi <stefanha@redhat.com>
Mon, 7 Oct 2013 11:23:19 +0000 (13:23 +0200)
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 (file)
--- 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;