OSDN Git Service

dirty-bitmap: switch assert-fails to errors in bdrv_merge_dirty_bitmap
authorVladimir Sementsov-Ogievskiy <vsementsov@virtuozzo.com>
Mon, 29 Oct 2018 20:23:14 +0000 (16:23 -0400)
committerJohn Snow <jsnow@redhat.com>
Mon, 29 Oct 2018 20:23:14 +0000 (16:23 -0400)
commit06bf50068a7e952afff8c4f6470ec54a712570f7
treed095df8902d9718dcc4c50568ca91efa4d177bb1
parent945c1ee0cb7d29f2fd0fece2cd2b5329802de5e9
dirty-bitmap: switch assert-fails to errors in bdrv_merge_dirty_bitmap

Move checks from qmp_x_block_dirty_bitmap_merge() to
bdrv_merge_dirty_bitmap(), to share them with dirty bitmap merge
transaction action in future commit.

Note: for now, only qmp_x_block_dirty_bitmap_merge() calls
bdrv_merge_dirty_bitmap().

Signed-off-by: Vladimir Sementsov-Ogievskiy <vsementsov@virtuozzo.com>
Reviewed-by: John Snow <jsnow@redhat.com>
block/dirty-bitmap.c
blockdev.c