aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRyan Harper <ryanh@us.ibm.com>2010-06-28 09:38:33 -0500
committerKevin Wolf <kwolf@redhat.com>2010-07-02 13:18:01 +0200
commit15c7733bb231090e5ebd6d10060dccdb98bb4941 (patch)
tree4f59db2e8dab09830758236e2d882d063fa222da
parent0c6f9c17f301f713b88daba6baadf9d7474ece72 (diff)
downloadqemu-15c7733bb231090e5ebd6d10060dccdb98bb4941.zip
qemu-15c7733bb231090e5ebd6d10060dccdb98bb4941.tar.gz
qemu-15c7733bb231090e5ebd6d10060dccdb98bb4941.tar.bz2
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>
-rw-r--r--block.c1
1 files changed, 0 insertions, 1 deletions
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;