[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PULL 06/12] vhdx: DIV_ROUND_UP() in vhdx_calc_bat_entries(
From: |
Jeff Cody |
Subject: |
[Qemu-devel] [PULL 06/12] vhdx: DIV_ROUND_UP() in vhdx_calc_bat_entries() |
Date: |
Mon, 29 Feb 2016 15:08:46 -0500 |
From: Max Reitz <address@hidden>
We have DIV_ROUND_UP(), so we can use it to produce more easily readable
code. It may be slower than the bit shifting currently performed
(because it actually performs a division), but since
vhdx_calc_bat_entries() is never used in a hot path, this is completely
fine.
Signed-off-by: Max Reitz <address@hidden>
Message-id: address@hidden
Signed-off-by: Jeff Cody <address@hidden>
---
block/vhdx.c | 10 ++--------
1 file changed, 2 insertions(+), 8 deletions(-)
diff --git a/block/vhdx.c b/block/vhdx.c
index 72042e9..1e7e03e 100644
--- a/block/vhdx.c
+++ b/block/vhdx.c
@@ -857,14 +857,8 @@ static void vhdx_calc_bat_entries(BDRVVHDXState *s)
{
uint32_t data_blocks_cnt, bitmap_blocks_cnt;
- data_blocks_cnt = s->virtual_disk_size >> s->block_size_bits;
- if (s->virtual_disk_size - (data_blocks_cnt << s->block_size_bits)) {
- data_blocks_cnt++;
- }
- bitmap_blocks_cnt = data_blocks_cnt >> s->chunk_ratio_bits;
- if (data_blocks_cnt - (bitmap_blocks_cnt << s->chunk_ratio_bits)) {
- bitmap_blocks_cnt++;
- }
+ data_blocks_cnt = DIV_ROUND_UP(s->virtual_disk_size, s->block_size);
+ bitmap_blocks_cnt = DIV_ROUND_UP(data_blocks_cnt, s->chunk_ratio);
if (s->parent_entries) {
s->bat_entries = bitmap_blocks_cnt * (s->chunk_ratio + 1);
--
1.9.3
- [Qemu-devel] [PULL 00/12] Block patches, Jeff Cody, 2016/02/29
- [Qemu-devel] [PULL 02/12] sheepdog: allow to delete snapshot, Jeff Cody, 2016/02/29
- [Qemu-devel] [PULL 01/12] block/nfs: add support for setting debug level, Jeff Cody, 2016/02/29
- [Qemu-devel] [PULL 04/12] curl: add support for HTTP authentication parameters, Jeff Cody, 2016/02/29
- [Qemu-devel] [PULL 05/12] iscsi: add support for getting CHAP password via QCryptoSecret API, Jeff Cody, 2016/02/29
- [Qemu-devel] [PULL 07/12] vhdx: Simplify vhdx_set_shift_bits(), Jeff Cody, 2016/02/29
- [Qemu-devel] [PULL 03/12] rbd: add support for getting password from QCryptoSecret object, Jeff Cody, 2016/02/29
- [Qemu-devel] [PULL 09/12] mirror: Add mirror_wait_for_io, Jeff Cody, 2016/02/29
- [Qemu-devel] [PULL 06/12] vhdx: DIV_ROUND_UP() in vhdx_calc_bat_entries(),
Jeff Cody <=
- [Qemu-devel] [PULL 12/12] iotests/124: Add cluster_size mismatch test, Jeff Cody, 2016/02/29
- [Qemu-devel] [PULL 11/12] block/backup: avoid copying less than full target clusters, Jeff Cody, 2016/02/29
- [Qemu-devel] [PULL 08/12] mirror: Rewrite mirror_iteration, Jeff Cody, 2016/02/29
- [Qemu-devel] [PULL 10/12] block/backup: make backup cluster size configurable, Jeff Cody, 2016/02/29