Commit f0f55ded authored by Alberto Garcia's avatar Alberto Garcia Committed by Max Reitz
Browse files

block: use the block job list in qmp_query_block_jobs() 



qmp_query_block_jobs() uses bdrv_next() to look for block jobs, but
this function can only find those in top-level BlockDriverStates.

This patch uses block_job_next() instead.

Signed-off-by: default avatarAlberto Garcia <berto@igalia.com>
Message-id: a8b7e5497b7c1fa67c12fcceae1630d01c3b1f96.1464346103.git.berto@igalia.com
Reviewed-by: default avatarMax Reitz <mreitz@redhat.com>
Signed-off-by: default avatarMax Reitz <mreitz@redhat.com>
parent eb1364ce

blockdev.c

+8 −12
Original line number Diff line number Diff line
@@ -4157,24 +4157,20 @@ void qmp_x_blockdev_change(const char *parent, bool has_child, 
BlockJobInfoList *qmp_query_block_jobs(Error **errp)

{

    BlockJobInfoList *head = NULL, **p_next = &head;

    BlockDriverState *bs;

    BdrvNextIterator it;

    BlockJob *job;



    for (bs = bdrv_first(&it); bs; bs = bdrv_next(&it)) {

        AioContext *aio_context = bdrv_get_aio_context(bs);

    for (job = block_job_next(NULL); job; job = block_job_next(job)) {

        BlockJobInfoList *elem = g_new0(BlockJobInfoList, 1);

        AioContext *aio_context = blk_get_aio_context(job->blk);



        aio_context_acquire(aio_context);

        elem->value = block_job_query(job);

        aio_context_release(aio_context);



        if (bs->job) {

            BlockJobInfoList *elem = g_new0(BlockJobInfoList, 1);

            elem->value = block_job_query(bs->job);

        *p_next = elem;

        p_next = &elem->next;

    }



        aio_context_release(aio_context);

    }



    return head;

}