diff options
| author | Laurent Vivier <lvivier@redhat.com> | 2016-05-31 18:35:52 +0200 |
|---|---|---|
| committer | Michael Tokarev <mjt@tls.msk.ru> | 2016-06-07 18:19:24 +0300 |
| commit | d737b78cc13d2ab94ffa4478da59931165cb1f4e (patch) | |
| tree | 62020c57b1ee6778cbdf9f2b4e7e343e49578c1b | |
| parent | 969401fe769264239c0f3e928283433b58910a19 (diff) | |
qcow/qcow2: Use DIV_ROUND_UP
Replace (((n) + (d) - 1) /(d)) by DIV_ROUND_UP(n,d).
This patch is the result of coccinelle script
scripts/coccinelle/round.cocci
CC: qemu-block@nongnu.org
Signed-off-by: Laurent Vivier <lvivier@redhat.com>
Reviewed-by: Eric Blake <eblake@redhat.com>
Signed-off-by: Michael Tokarev <mjt@tls.msk.ru>
| -rw-r--r-- | block/qcow.c | 4 | ||||
| -rw-r--r-- | block/qcow2-cluster.c | 4 | ||||
| -rw-r--r-- | block/qcow2-refcount.c | 6 |
3 files changed, 6 insertions, 8 deletions
diff --git a/block/qcow.c b/block/qcow.c index cb4bf0299f..c5cf813469 100644 --- a/block/qcow.c +++ b/block/qcow.c @@ -868,8 +868,8 @@ static int qcow_create(const char *filename, QemuOpts *opts, Error **errp) } tmp = g_malloc0(BDRV_SECTOR_SIZE); - for (i = 0; i < ((sizeof(uint64_t)*l1_size + BDRV_SECTOR_SIZE - 1)/ - BDRV_SECTOR_SIZE); i++) { + for (i = 0; i < DIV_ROUND_UP(sizeof(uint64_t) * l1_size, BDRV_SECTOR_SIZE); + i++) { ret = blk_pwrite(qcow_blk, header_size + BDRV_SECTOR_SIZE * i, tmp, BDRV_SECTOR_SIZE, 0); if (ret != BDRV_SECTOR_SIZE) { diff --git a/block/qcow2-cluster.c b/block/qcow2-cluster.c index 892e0fbfbf..c73797378e 100644 --- a/block/qcow2-cluster.c +++ b/block/qcow2-cluster.c @@ -1868,8 +1868,8 @@ int qcow2_expand_zero_clusters(BlockDriverState *bs, } for (i = 0; i < s->nb_snapshots; i++) { - int l1_sectors = (s->snapshots[i].l1_size * sizeof(uint64_t) + - BDRV_SECTOR_SIZE - 1) / BDRV_SECTOR_SIZE; + int l1_sectors = DIV_ROUND_UP(s->snapshots[i].l1_size * + sizeof(uint64_t), BDRV_SECTOR_SIZE); l1_table = g_realloc(l1_table, l1_sectors * BDRV_SECTOR_SIZE); diff --git a/block/qcow2-refcount.c b/block/qcow2-refcount.c index 7fa972a383..66f187a74b 100644 --- a/block/qcow2-refcount.c +++ b/block/qcow2-refcount.c @@ -490,14 +490,12 @@ static int alloc_refcount_block(BlockDriverState *bs, uint64_t table_clusters = size_to_clusters(s, table_size * sizeof(uint64_t)); blocks_clusters = 1 + - ((table_clusters + s->refcount_block_size - 1) - / s->refcount_block_size); + DIV_ROUND_UP(table_clusters, s->refcount_block_size); uint64_t meta_clusters = table_clusters + blocks_clusters; last_table_size = table_size; table_size = next_refcount_table_size(s, blocks_used + - ((meta_clusters + s->refcount_block_size - 1) - / s->refcount_block_size)); + DIV_ROUND_UP(meta_clusters, s->refcount_block_size)); } while (last_table_size != table_size); |