Commit d5b68844 authored by Kevin Wolf's avatar Kevin Wolf
Browse files

block/qapi: Use blk_all_next() for query-block 



This patch replaces the blk_next() loop in query-block by a
blk_all_next() one so that we also get access to BlockBackends that
aren't owned by the monitor. For now, the next thing we do is check
whether each BB has a name, so there is no semantic difference.

Signed-off-by: default avatarKevin Wolf <kwolf@redhat.com>
Reviewed-by: default avatarEric Blake <eblake@redhat.com>
Reviewed-by: default avatarJohn Snow <jsnow@redhat.com>
parent a429b9b5

block/qapi.c

+8 −2
Original line number Diff line number Diff line
@@ -472,8 +472,14 @@ BlockInfoList *qmp_query_block(Error **errp) 
    BlockBackend *blk;

    Error *local_err = NULL;



    for (blk = blk_next(NULL); blk; blk = blk_next(blk)) {

        BlockInfoList *info = g_malloc0(sizeof(*info));

    for (blk = blk_all_next(NULL); blk; blk = blk_all_next(blk)) {

        BlockInfoList *info;



        if (!*blk_name(blk)) {

            continue;

        }



        info = g_malloc0(sizeof(*info));

        bdrv_query_info(blk, &info->value, &local_err);

        if (local_err) {

            error_propagate(errp, local_err);