Commit 15c7733b authored by Ryan Harper's avatar Ryan Harper Committed by Kevin Wolf
Browse files

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: default avatarRyan Harper <ryanh@us.ibm.com>
Signed-off-by: default avatarKevin Wolf <kwolf@redhat.com>
parent 0c6f9c17

block.c

+0 −1
Original line number Diff line number Diff line
@@ -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;