Re: [Qemu-devel] [PATCH 01/22] block: Move initialisation of BlockLimits to bdrv_refresh_limits()

[Kevin Wolf]

Am 12.12.2013 um 08:51 hat Thomas Huth geschrieben:
> On Thu, 12 Dec 2013 10:57:49 +0800
> Wenchao Xia <address@hidden> wrote:
> 
> > 
> > >> +static int bdrv_refresh_limits(BlockDriverState *bs)
> > >> +{
> > >> +    BlockDriver *drv = bs->drv;
> > >> +
> > >> +    memset(&bs->bl, 0, sizeof(bs->bl));
> > >> +
> > >> +    if (!drv) {
> > >> +        return 0;
> > >> +    } else if (drv->bdrv_refresh_limits) {
> > >> +        return drv->bdrv_refresh_limits(bs);
> > >> +    }
> > >> +
> > >> +    return 0;
> > >      It seems this line can be removed.
> > > 
> >   I missed the "else if", then the patch is OK.
>  
> But it could also be written in a shorter way:
> 
>     if (drv && drv->bdrv_refresh_limits) {
>         return drv->bdrv_refresh_limits(bs);
>     }
> 
>     return 0;

Indeed, with some code changes, this has become a bit more complicated
than necessary. I need to touch the patch anyway for Peter's comments,
so I'll change it, even though it disappears anyway later in the series.

Kevin