Re: [PATCH v2 3/4] block: detect DKIOCGETBLOCKCOUNT/SIZE before use

[Peter Maydell]

On Tue, 9 Mar 2021 at 00:30, Joelle van Dyne <j@getutm.app> wrote:
>
> iOS hosts do not have these defined so we fallback to the
> default behaviour.
>
> Co-authored-by: Warner Losh <imp@bsdimp.com>
> Signed-off-by: Joelle van Dyne <j@getutm.app>
> ---
>  block/file-posix.c | 18 +++++++-----------
>  1 file changed, 7 insertions(+), 11 deletions(-)

raw_getlength() is a bit of a mess; this certainly seems like
an improvement...

> diff --git a/block/file-posix.c b/block/file-posix.c
> index d1ab3180ff..9b6d7ddda3 100644
> --- a/block/file-posix.c
> +++ b/block/file-posix.c
> @@ -2326,8 +2326,10 @@ static int64_t raw_getlength(BlockDriverState *bs)
>  again:
>  #endif
>      if (!fstat(fd, &sb) && (S_IFCHR & sb.st_mode)) {
> +        size = 0;
>  #ifdef DIOCGMEDIASIZE
>          if (ioctl(fd, DIOCGMEDIASIZE, (off_t *)&size))
> +            size = 0;

this if() should have braces {}.

Otherwise
Reviewed-by: Peter Maydell <peter.maydell@linaro.org>

thanks
-- PMM