Merge tag 'for-upstream' of git://repo.or.cz/qemu/kevin into staging

[mirror_qemu.git] / include / block / block_int-io.h

diff --git a/include/block/block_int-io.h b/include/block/block_int-io.h
index bb454200e512bfb23d8e5d97bb3ecccf490ae8cd..ded29e74947e454149c3c8660a99f082db36ad18 100644 (file)
--- a/include/block/block_int-io.h
+++ b/include/block/block_int-io.h
@@ -102,7 +102,7 @@ bool blk_dev_is_tray_open(BlockBackend *blk);
 void bdrv_set_dirty(BlockDriverState *bs, int64_t offset, int64_t bytes);
 
 void bdrv_clear_dirty_bitmap(BdrvDirtyBitmap *bitmap, HBitmap **out);
-bool bdrv_dirty_bitmap_merge_internal(BdrvDirtyBitmap *dest,
+void bdrv_dirty_bitmap_merge_internal(BdrvDirtyBitmap *dest,
                                       const BdrvDirtyBitmap *src,
                                       HBitmap **backup, bool lock);