From: Alberto Garcia <[email protected]> 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: Alberto Garcia <[email protected]> Message-id: a8b7e5497b7c1fa67c12fcceae1630d01c3b1f96.1464346103.git.be...@igalia.com Reviewed-by: Max Reitz <[email protected]> Signed-off-by: Max Reitz <[email protected]> --- blockdev.c | 20 ++++++++------------ 1 file changed, 8 insertions(+), 12 deletions(-) diff --git a/blockdev.c b/blockdev.c index 11177b4..1d498c7 100644 --- a/blockdev.c +++ b/blockdev.c @@ -4157,22 +4157,18 @@ 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); - - if (bs->job) { - BlockJobInfoList *elem = g_new0(BlockJobInfoList, 1); - elem->value = block_job_query(bs->job); - *p_next = elem; - p_next = &elem->next; - } - + elem->value = block_job_query(job); aio_context_release(aio_context); + + *p_next = elem; + p_next = &elem->next; } return head; -- 1.8.3.1
