diff options
| author | Peter Maydell <peter.maydell@linaro.org> | 2016-07-20 17:05:35 +0100 |
|---|---|---|
| committer | Peter Maydell <peter.maydell@linaro.org> | 2016-07-20 17:05:35 +0100 |
| commit | e0ce97f896ac752b734c22a6d0d1b3e1739d1158 (patch) | |
| tree | ddacbe390cb6812c6f383d6090ebf7afabbdc9e3 /include | |
| parent | 3b2e6798ffdc69a7bd630657651c778d95250b76 (diff) | |
| parent | 6c7189bb29de9fa2202f613f3c6caf028f96f261 (diff) | |
Merge remote-tracking branch 'remotes/cody/tags/block-pull-request' into staging
# gpg: Signature made Wed 20 Jul 2016 01:18:39 BST
# gpg: using RSA key 0xBDBE7B27C0DE3057
# gpg: Good signature from "Jeffrey Cody <jcody@redhat.com>"
# gpg: aka "Jeffrey Cody <jeff@codyprime.org>"
# gpg: aka "Jeffrey Cody <codyprime@gmail.com>"
# Primary key fingerprint: 9957 4B4D 3474 90E7 9D98 D624 BDBE 7B27 C0DE 3057
* remotes/cody/tags/block-pull-request:
block/gluster: add support for multiple gluster servers
block/gluster: using new qapi schema
block/gluster: deprecate rdma support
block/gluster: code cleanup
block/gluster: rename [server, volname, image] -> [host, volume, path]
mirror: fix request throttling in drive-mirror
mirror: improve performance of mirroring of empty disk
mirror: efficiently zero out target
mirror: optimize dirty bitmap filling in mirror_run a bit
block: remove extra condition in bdrv_can_write_zeroes_with_unmap
mirror: create mirror_dirty_init helper for mirror_run
mirror: create mirror_throttle helper
mirror: make sectors_in_flight int64_t
dirty-bitmap: operate with int64_t amount
Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
Diffstat (limited to 'include')
| -rw-r--r-- | include/block/block_int.h | 2 | ||||
| -rw-r--r-- | include/block/dirty-bitmap.h | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/include/block/block_int.h b/include/block/block_int.h index a6b13adb45..09be16f88c 100644 --- a/include/block/block_int.h +++ b/include/block/block_int.h @@ -783,7 +783,7 @@ void blk_dev_eject_request(BlockBackend *blk, bool force); bool blk_dev_is_tray_open(BlockBackend *blk); bool blk_dev_is_medium_locked(BlockBackend *blk); -void bdrv_set_dirty(BlockDriverState *bs, int64_t cur_sector, int nr_sectors); +void bdrv_set_dirty(BlockDriverState *bs, int64_t cur_sector, int64_t nr_sect); bool bdrv_requests_pending(BlockDriverState *bs); void bdrv_clear_dirty_bitmap(BdrvDirtyBitmap *bitmap, HBitmap **out); diff --git a/include/block/dirty-bitmap.h b/include/block/dirty-bitmap.h index 80afe603f6..ee3388f90d 100644 --- a/include/block/dirty-bitmap.h +++ b/include/block/dirty-bitmap.h @@ -33,9 +33,9 @@ DirtyBitmapStatus bdrv_dirty_bitmap_status(BdrvDirtyBitmap *bitmap); int bdrv_get_dirty(BlockDriverState *bs, BdrvDirtyBitmap *bitmap, int64_t sector); void bdrv_set_dirty_bitmap(BdrvDirtyBitmap *bitmap, - int64_t cur_sector, int nr_sectors); + int64_t cur_sector, int64_t nr_sectors); void bdrv_reset_dirty_bitmap(BdrvDirtyBitmap *bitmap, - int64_t cur_sector, int nr_sectors); + int64_t cur_sector, int64_t nr_sectors); void bdrv_dirty_iter_init(BdrvDirtyBitmap *bitmap, struct HBitmapIter *hbi); void bdrv_set_dirty_iter(struct HBitmapIter *hbi, int64_t offset); int64_t bdrv_get_dirty_count(BdrvDirtyBitmap *bitmap); |