From patchwork Fri Sep 28 15:22:48 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: [05/19] block: add block_job_query From: Paolo Bonzini X-Patchwork-Id: 187805 Message-Id: <1348845782-15073-6-git-send-email-pbonzini@redhat.com> To: qemu-devel@nongnu.org Cc: kwolf@redhat.com Date: Fri, 28 Sep 2012 17:22:48 +0200 Extract it out of the implementation of info block-jobs. Signed-off-by: Paolo Bonzini --- blockdev.c | 15 ++------------- blockjob.c | 11 +++++++++++ blockjob.h | 8 ++++++++ 3 file modificati, 21 inserzioni(+), 13 rimozioni(-) diff --git a/blockdev.c b/blockdev.c index 7ab7d5e..5772c11 100644 --- a/blockdev.c +++ b/blockdev.c @@ -1169,19 +1169,8 @@ static void do_qmp_query_block_jobs_one(void *opaque, BlockDriverState *bs) BlockJob *job = bs->job; if (job) { - BlockJobInfoList *elem; - BlockJobInfo *info = g_new(BlockJobInfo, 1); - *info = (BlockJobInfo){ - .type = g_strdup(job->job_type->job_type), - .device = g_strdup(bdrv_get_device_name(bs)), - .len = job->len, - .offset = job->offset, - .speed = job->speed, - }; - - elem = g_new0(BlockJobInfoList, 1); - elem->value = info; - + BlockJobInfoList *elem = g_new0(BlockJobInfoList, 1); + elem->value = block_job_query(bs->job); (*prev)->next = elem; *prev = elem; } diff --git a/blockjob.c b/blockjob.c index 9737a43..dea63f8 100644 --- a/blockjob.c +++ b/blockjob.c @@ -161,3 +161,14 @@ void block_job_sleep_ns(BlockJob *job, QEMUClock *clock, int64_t ns) job->busy = true; } } + +BlockJobInfo *block_job_query(BlockJob *job) +{ + BlockJobInfo *info = g_new0(BlockJobInfo, 1); + info->type = g_strdup(job->job_type->job_type); + info->device = g_strdup(bdrv_get_device_name(job->bs)); + info->len = job->len; + info->offset = job->offset; + info->speed = job->speed; + return info; +} diff --git a/blockjob.h b/blockjob.h index 753f5bc..f3d8d58 100644 --- a/blockjob.h +++ b/blockjob.h @@ -163,6 +163,14 @@ void block_job_cancel(BlockJob *job); bool block_job_is_cancelled(BlockJob *job); /** + * block_job_query: + * @job: The job to get information about. + * + * Return information about a job. + */ +BlockJobInfo *block_job_query(BlockJob *job); + +/** * block_job_cancel_sync: * @job: The job to be canceled. *