diff options
| author | Vladimir Sementsov-Ogievskiy | 2019-09-27 14:23:55 +0200 |
|---|---|---|
| committer | John Snow | 2019-10-17 23:53:28 +0200 |
| commit | 4dd09f6223b25096d731615d279751e415224e3e (patch) | |
| tree | a42466381d2d03d38ec42b64daa93b645a04b50c /include/block | |
| parent | block/qcow2-bitmap: fix and improve qcow2_reopen_bitmaps_rw (diff) | |
| download | qemu-4dd09f6223b25096d731615d279751e415224e3e.tar.gz qemu-4dd09f6223b25096d731615d279751e415224e3e.tar.xz qemu-4dd09f6223b25096d731615d279751e415224e3e.zip | |
qcow2-bitmap: move bitmap reopen-rw code to qcow2_reopen_commit
The only reason I can imagine for this strange code at the very-end of
bdrv_reopen_commit is the fact that bs->read_only updated after
calling drv->bdrv_reopen_commit in bdrv_reopen_commit. And in the same
time, prior to previous commit, qcow2_reopen_bitmaps_rw did a wrong
check for being writable, when actually it only need writable file
child not self.
So, as it's fixed, let's move things to correct place.
Signed-off-by: Vladimir Sementsov-Ogievskiy <vsementsov@virtuozzo.com>
Reviewed-by: John Snow <jsnow@redhat.com>
Acked-by: Max Reitz <mreitz@redhat.com>
Message-id: 20190927122355.7344-10-vsementsov@virtuozzo.com
Signed-off-by: John Snow <jsnow@redhat.com>
Diffstat (limited to 'include/block')
| -rw-r--r-- | include/block/block_int.h | 6 |
1 files changed, 0 insertions, 6 deletions
diff --git a/include/block/block_int.h b/include/block/block_int.h index 32fb493cbb..ca4ccac4c1 100644 --- a/include/block/block_int.h +++ b/include/block/block_int.h @@ -547,12 +547,6 @@ struct BlockDriver { uint64_t parent_perm, uint64_t parent_shared, uint64_t *nperm, uint64_t *nshared); - /** - * Bitmaps should be marked as 'IN_USE' in the image on reopening image - * as rw. This handler should realize it. It also should unset readonly - * field of BlockDirtyBitmap's in case of success. - */ - int (*bdrv_reopen_bitmaps_rw)(BlockDriverState *bs, Error **errp); bool (*bdrv_co_can_store_new_dirty_bitmap)(BlockDriverState *bs, const char *name, uint32_t granularity, |