diff options
| author | Vladimir Sementsov-Ogievskiy <vsementsov@virtuozzo.com> | 2019-09-20 11:25:43 +0300 |
|---|---|---|
| committer | John Snow <jsnow@redhat.com> | 2019-10-17 17:02:32 -0400 |
| commit | d2c3080e41fd2c9bc36c996cc9d33804462ba803 (patch) | |
| tree | faa16eec6452d036d5762ca0329a4ecdcb0b1ab2 /block/qcow2.c | |
| parent | b56a1e31759b750e111b4dd35171007bf493fc89 (diff) | |
| download | qemu-d2c3080e41fd2c9bc36c996cc9d33804462ba803.zip qemu-d2c3080e41fd2c9bc36c996cc9d33804462ba803.tar.gz qemu-d2c3080e41fd2c9bc36c996cc9d33804462ba803.tar.bz2 | |
block/qcow2: proper locking on bitmap add/remove paths
qmp_block_dirty_bitmap_add and do_block_dirty_bitmap_remove do acquire
aio context since 0a6c86d024c52b. But this is not enough: we also must
lock qcow2 mutex when access in-image metadata. Especially it concerns
freeing qcow2 clusters.
To achieve this, move qcow2_can_store_new_dirty_bitmap and
qcow2_remove_persistent_dirty_bitmap to coroutine context.
Since we work in coroutines in correct aio context, we don't need
context acquiring in blockdev.c anymore, drop it.
Signed-off-by: Vladimir Sementsov-Ogievskiy <vsementsov@virtuozzo.com>
Reviewed-by: John Snow <jsnow@redhat.com>
Message-id: 20190920082543.23444-4-vsementsov@virtuozzo.com
Signed-off-by: John Snow <jsnow@redhat.com>
Diffstat (limited to 'block/qcow2.c')
| -rw-r--r-- | block/qcow2.c | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/block/qcow2.c b/block/qcow2.c index 7961c05..7062ecc 100644 --- a/block/qcow2.c +++ b/block/qcow2.c @@ -5407,8 +5407,9 @@ BlockDriver bdrv_qcow2 = { .bdrv_attach_aio_context = qcow2_attach_aio_context, .bdrv_reopen_bitmaps_rw = qcow2_reopen_bitmaps_rw, - .bdrv_can_store_new_dirty_bitmap = qcow2_can_store_new_dirty_bitmap, - .bdrv_remove_persistent_dirty_bitmap = qcow2_remove_persistent_dirty_bitmap, + .bdrv_co_can_store_new_dirty_bitmap = qcow2_co_can_store_new_dirty_bitmap, + .bdrv_co_remove_persistent_dirty_bitmap = + qcow2_co_remove_persistent_dirty_bitmap, }; static void bdrv_qcow2_init(void) |