Patchwork [PULL,8/8] block: use correct filename

login
register
mail settings
Submitter Stefan Hajnoczi
Date Oct. 7, 2013, 11:28 a.m.
Message ID <1381145289-6591-9-git-send-email-stefanha@redhat.com>
Download mbox | patch
Permalink /patch/281078/
State New
Headers show

Comments

Stefan Hajnoczi - Oct. 7, 2013, 11:28 a.m.
From: Dunrong Huang <riegamaths@gmail.com>

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 | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

Patch

diff --git a/block.c b/block.c
index e2d9936..d7ca37e 100644
--- 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;