Hi Yi Li,
thanks for this patch! Just a comment below:
On Mon, Aug 17, 2020 at 07:01:13PM +0800, Yi Li wrote:
> Signed-off-by: Yi Li <y...@winhong.com>
> ---
> qemu-img.c | 12 ++++++------
> 1 file changed, 6 insertions(+), 6 deletions(-)
>
> diff --git a/qemu-img.c b/qemu-img.c
> index 5308773811..a0fbc2757c 100644
> --- a/qemu-img.c
> +++ b/qemu-img.c
> @@ -1181,7 +1181,7 @@ static int64_t find_nonzero(const uint8_t *buf, int64_t
> n)
> }
>
> /*
> - * Returns true iff the first sector pointed to by 'buf' contains at least
> + * Returns true if the first sector pointed to by 'buf' contains at least
This change seems unrelated, please can you put this in a separate patch?
Thanks,
Stefano
> * a non-NUL byte.
> *
> * 'pnum' is set to the number of sectors (including and immediately
> following
> @@ -1200,10 +1200,10 @@ static int is_allocated_sectors(const uint8_t *buf,
> int n, int *pnum,
> *pnum = 0;
> return 0;
> }
> - is_zero = buffer_is_zero(buf, 512);
> + is_zero = buffer_is_zero(buf, BDRV_SECTOR_SIZE);
> for(i = 1; i < n; i++) {
> - buf += 512;
> - if (is_zero != buffer_is_zero(buf, 512)) {
> + buf += BDRV_SECTOR_SIZE;
> + if (is_zero != buffer_is_zero(buf, BDRV_SECTOR_SIZE)) {
> break;
> }
> }
> @@ -2489,8 +2489,8 @@ static int img_convert(int argc, char **argv)
> }
> }
>
> - qemu_opt_set_number(opts, BLOCK_OPT_SIZE, s.total_sectors * 512,
> - &error_abort);
> + qemu_opt_set_number(opts, BLOCK_OPT_SIZE,
> + s.total_sectors * BDRV_SECTOR_SIZE,
> &error_abort);
> ret = add_old_style_options(out_fmt, opts, out_baseimg, NULL);
> if (ret < 0) {
> goto out;
> --
> 2.25.3
>
>
>
>
