From patchwork Wed Sep 26 15:56:11 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Paolo Bonzini X-Patchwork-Id: 187110 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from lists.gnu.org (lists.gnu.org [208.118.235.17]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (Client did not present a certificate) by ozlabs.org (Postfix) with ESMTPS id 0D1C42C008F for ; Thu, 27 Sep 2012 01:58:15 +1000 (EST) Received: from localhost ([::1]:41891 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1TGu04-0001xb-NK for incoming@patchwork.ozlabs.org; Wed, 26 Sep 2012 11:58:12 -0400 Received: from eggs.gnu.org ([208.118.235.92]:48279) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1TGtzO-0000iE-3X for qemu-devel@nongnu.org; Wed, 26 Sep 2012 11:57:35 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1TGtzH-0004dI-Py for qemu-devel@nongnu.org; Wed, 26 Sep 2012 11:57:29 -0400 Received: from mail-pa0-f45.google.com ([209.85.220.45]:37650) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1TGtzH-0004VJ-Jr for qemu-devel@nongnu.org; Wed, 26 Sep 2012 11:57:23 -0400 Received: by mail-pa0-f45.google.com with SMTP id fb10so562435pad.4 for ; Wed, 26 Sep 2012 08:57:23 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=sender:from:to:cc:subject:date:message-id:x-mailer:in-reply-to :references; bh=Mm8A7qsN2l8Zqp1FS7RW7izbqZlgDNa+31BF5Q0ffL4=; b=dZWkHMOiyQwUQRmnZgXCPZbm+qEjBGAN7iXc1nbxcAnTsiSQ9zu9aPFr0/rGWHmGWG zReEOreJY1crl+kCn5GSYrrsVhrzWH5cuUNYTBdFrZPkrJJf0De0ms6Sz4uJvRl/lj+7 7YCLK8zuP+2f1Q12tIgsb3vp+8upZwX6cb87HUUlEnPVQAeQFcPAJrsjMiMjYli4yYeX IIwWSuBRxzkCEggGwJcZTH6YYNsRECjxhi9vASMdhdOacSW01n+jtCKk9ruAtPbz7lvh 5ya4dmCauJVjLwaOrJdWkpzR6zvZBeaa5W4BzQvORVMtAaEpnRzHNUgEfFwhyXBtOpmW PqoQ== Received: by 10.66.89.6 with SMTP id bk6mr2147639pab.81.1348675042978; Wed, 26 Sep 2012 08:57:22 -0700 (PDT) Received: from yakj.usersys.redhat.com (93-34-169-1.ip50.fastwebnet.it. [93.34.169.1]) by mx.google.com with ESMTPS id i2sm2114149pav.13.2012.09.26.08.57.19 (version=TLSv1/SSLv3 cipher=OTHER); Wed, 26 Sep 2012 08:57:21 -0700 (PDT) From: Paolo Bonzini To: qemu-devel@nongnu.org Date: Wed, 26 Sep 2012 17:56:11 +0200 Message-Id: <1348675011-8794-6-git-send-email-pbonzini@redhat.com> X-Mailer: git-send-email 1.7.12 In-Reply-To: <1348675011-8794-1-git-send-email-pbonzini@redhat.com> References: <1348675011-8794-1-git-send-email-pbonzini@redhat.com> X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 209.85.220.45 Cc: kwolf@redhat.com, jcody@redhat.com Subject: [Qemu-devel] [PATCH v2 05/45] block: add block_job_query X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Sender: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Extract it out of the implementation of info block-jobs. Signed-off-by: Paolo Bonzini --- v1->v2: use g_new0. 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 559518a..c6af0fb 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. *