On 10/21/2014 02:51 AM, Max Reitz wrote: > There are macros for these operations, so make use of them. > > Signed-off-by: Max Reitz <mre...@redhat.com> > --- > block/vdi.c | 9 ++++----- > 1 file changed, 4 insertions(+), 5 deletions(-) >
> @@ -475,7 +474,7 @@ static int vdi_open(BlockDriverState *bs, QDict *options,
> int flags,
> s->header = header;
>
> bmap_size = header.blocks_in_image * sizeof(uint32_t);
> - bmap_size = (bmap_size + SECTOR_SIZE - 1) / SECTOR_SIZE;
> + bmap_size = DIV_ROUND_UP(bmap_size, SECTOR_SIZE);
Is it worth consolidating these two assignments into one:
bmap_size = DIV_ROUND_UP(header.blocks_in_image * sizeof(uint32_t),
SECTOR_SIZE);
> @@ -736,10 +735,10 @@ static int vdi_create(const char *filename, QemuOpts
> *opts, Error **errp)
>
> /* We need enough blocks to store the given disk size,
> so always round up. */
> - blocks = (bytes + block_size - 1) / block_size;
> + blocks = DIV_ROUND_UP(bytes, block_size);
>
> bmap_size = blocks * sizeof(uint32_t);
> - bmap_size = ((bmap_size + SECTOR_SIZE - 1) & ~(SECTOR_SIZE -1));
> + bmap_size = ROUND_UP(bmap_size, SECTOR_SIZE);
and again?
Either way,
Reviewed-by: Eric Blake <ebl...@redhat.com>
--
Eric Blake eblake redhat com +1-919-301-3266
Libvirt virtualization library http://libvirt.org
signature.asc
Description: OpenPGP digital signature
