On 07/31/2017 07:51 AM, Kevin Wolf wrote: > When skipping implicit nodes in bdrv_block_device_info(), we know that > bs0 is always non-NULL; initially, because it's taken from a BdrvChild > and a BdrvChild never has a NULL bs, and after the first iteration > because implicit nodes always have a backing file. > > Remove the NULL check and add an assertion that the implicit node does > indeed have a backing file. > > Signed-off-by: Kevin Wolf <kw...@redhat.com> > --- > block/qapi.c | 3 ++- > 1 file changed, 2 insertions(+), 1 deletion(-)
Reviewed-by: Eric Blake <ebl...@redhat.com>
>
> diff --git a/block/qapi.c b/block/qapi.c
> index d2b18ee9df..5f1a71f5d2 100644
> --- a/block/qapi.c
> +++ b/block/qapi.c
> @@ -145,8 +145,9 @@ BlockDeviceInfo *bdrv_block_device_info(BlockBackend *blk,
>
> /* Skip automatically inserted nodes that the user isn't aware of for
> * query-block (blk != NULL), but not for query-named-block-nodes */
> - while (blk && bs0 && bs0->drv && bs0->implicit) {
> + while (blk && bs0->drv && bs0->implicit) {
> bs0 = backing_bs(bs0);
> + assert(bs0);
> }
> }
>
>
--
Eric Blake, Principal Software Engineer
Red Hat, Inc. +1-919-301-3266
Virtualization: qemu.org | libvirt.org
signature.asc
Description: OpenPGP digital signature
