From: Ryan Harper <ryanh@us.ibm.com>
Date: Mon, 28 Jun 2010 14:38:33 +0000 (-0500)
Subject: Don't reset bs->is_temporary in bdrv_open_common
X-Git-Url: http://git.osdn.net/view?a=commitdiff_plain;h=15c7733bb231090e5ebd6d10060dccdb98bb4941;p=qmiga%2Fqemu.git

Don't reset bs->is_temporary in bdrv_open_common

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>
---

diff --git a/block.c b/block.c
index 0aaec3bf35..31ca4c5a43 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;