diff options
author | Blue Swirl <blauwirbel@gmail.com> | 2010-07-25 20:49:34 +0000 |
---|---|---|
committer | Anthony Liguori <aliguori@us.ibm.com> | 2010-07-28 14:04:25 -0500 |
commit | 7829bc6c9f25d98038af889217aa30c94ef314f9 (patch) | |
tree | 9c63ccac83fddfff87e8d9f655c904539d1c89d0 | |
parent | 32b8bb3b3b2113864b06933723a04da22b82c289 (diff) | |
download | qemu-7829bc6c9f25d98038af889217aa30c94ef314f9.zip qemu-7829bc6c9f25d98038af889217aa30c94ef314f9.tar.gz qemu-7829bc6c9f25d98038af889217aa30c94ef314f9.tar.bz2 |
Fix -snapshot deleting images on disk change
Block device change command did not copy BDRV_O_SNAPSHOT flag. Thus
the new image did not have this flag and the file got deleted during
opening.
Fix by copying BDRV_O_SNAPSHOT flag.
Signed-off-by: Blue Swirl <blauwirbel@gmail.com>
Signed-off-by: Kevin Wolf <kwolf@redhat.com>
(cherry picked from commit 199630b62ec7cc5efd6f860ff545b449c7b5cdb8)
Signed-off-by: Anthony Liguori <aliguori@us.ibm.com>
-rw-r--r-- | block.c | 5 | ||||
-rw-r--r-- | block.h | 1 | ||||
-rw-r--r-- | blockdev.c | 1 |
3 files changed, 7 insertions, 0 deletions
@@ -1811,6 +1811,11 @@ int bdrv_can_snapshot(BlockDriverState *bs) return 1; } +int bdrv_is_snapshot(BlockDriverState *bs) +{ + return !!(bs->open_flags & BDRV_O_SNAPSHOT); +} + BlockDriverState *bdrv_snapshots(void) { BlockDriverState *bs; @@ -202,6 +202,7 @@ const char *bdrv_get_encrypted_filename(BlockDriverState *bs); void bdrv_get_backing_filename(BlockDriverState *bs, char *filename, int filename_size); int bdrv_can_snapshot(BlockDriverState *bs); +int bdrv_is_snapshot(BlockDriverState *bs); BlockDriverState *bdrv_snapshots(void); int bdrv_snapshot_create(BlockDriverState *bs, QEMUSnapshotInfo *sn_info); @@ -590,6 +590,7 @@ int do_change_block(Monitor *mon, const char *device, return -1; } bdrv_flags = bdrv_is_read_only(bs) ? 0 : BDRV_O_RDWR; + bdrv_flags |= bdrv_is_snapshot(bs) ? BDRV_O_SNAPSHOT : 0; if (bdrv_open(bs, filename, bdrv_flags, drv) < 0) { qerror_report(QERR_OPEN_FILE_FAILED, filename); return -1; |