Patchwork [06/23] Don't reset bs->is_temporary in bdrv_open_common

login
register
mail settings
Submitter Kevin Wolf
Date July 2, 2010, 4:38 p.m.
Message ID <1278088712-12302-7-git-send-email-kwolf@redhat.com>
Download mbox | patch
Permalink /patch/57678/
State New
Headers show

Comments

Kevin Wolf - July 2, 2010, 4:38 p.m.
From: Ryan Harper <ryanh@us.ibm.com>

To fix https://bugs.launchpad.net/qemu/+bug/597402 where qemu fails to
call unlink() on temporary snapshots due to bs->is_temporary getting clobbered
in bdrv_open_common() after being set in bdrv_open() which calls the former.

We don't need to initialize bs->is_temporary in bdrv_open_common().

Signed-off-by: Ryan Harper <ryanh@us.ibm.com>
Signed-off-by: Kevin Wolf <kwolf@redhat.com>
---
 block.c |    1 -
 1 files changed, 0 insertions(+), 1 deletions(-)

Patch

diff --git a/block.c b/block.c
index 0aaec3b..31ca4c5 100644
--- a/block.c
+++ b/block.c
@@ -400,7 +400,6 @@  static int bdrv_open_common(BlockDriverState *bs, const char *filename,
 
     bs->file = NULL;
     bs->total_sectors = 0;
-    bs->is_temporary = 0;
     bs->encrypted = 0;
     bs->valid_key = 0;
     bs->open_flags = flags;