I used the clang-tidy qemu-round check to generate the fix: https://github.com/elmarco/clang-tools-extra
Signed-off-by: Marc-André Lureau <marcandre.lur...@redhat.com> --- block/vvfat.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/block/vvfat.c b/block/vvfat.c index 426ca70e35..877f71dcdc 100644 --- a/block/vvfat.c +++ b/block/vvfat.c @@ -433,7 +433,7 @@ static inline direntry_t* create_long_filename(BDRVVVFATState* s,const char* fil { char buffer[258]; int length=short2long_name(buffer,filename), - number_of_entries=(length+25)/26,i; + number_of_entries=DIV_ROUND_UP(length, 26),i; direntry_t* entry; for(i=0;i<number_of_entries;i++) { @@ -2424,7 +2424,7 @@ static int commit_one_file(BDRVVVFATState* s, (size > offset && c >=2 && !fat_eof(s, c))); ret = vvfat_read(s->bs, cluster2sector(s, c), - (uint8_t*)cluster, (rest_size + 0x1ff) / 0x200); + (uint8_t*)cluster, DIV_ROUND_UP(rest_size, 0x200)); if (ret < 0) { qemu_close(fd); -- 2.13.1.395.gf7b71de06