From patchwork Tue Jul 24 11:03:42 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Paolo Bonzini X-Patchwork-Id: 172840 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 148E32C008A for ; Tue, 24 Jul 2012 21:32:38 +1000 (EST) Received: from localhost ([::1]:39615 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Stcvu-0007D3-Oy for incoming@patchwork.ozlabs.org; Tue, 24 Jul 2012 07:05:42 -0400 Received: from eggs.gnu.org ([208.118.235.92]:56442) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1StcvC-0005DE-28 for qemu-devel@nongnu.org; Tue, 24 Jul 2012 07:05:02 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1Stcv2-00058m-Ee for qemu-devel@nongnu.org; Tue, 24 Jul 2012 07:04:57 -0400 Received: from mail-gh0-f173.google.com ([209.85.160.173]:56878) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Stcv2-00057T-B2 for qemu-devel@nongnu.org; Tue, 24 Jul 2012 07:04:48 -0400 Received: by mail-gh0-f173.google.com with SMTP id r14so6581166ghr.4 for ; Tue, 24 Jul 2012 04:04:48 -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=8m8gkjftbv192kApvrGoA+df97moIjvsv2quFpga07w=; b=lrWfYmG3n/evIMAKQRsG6DgTp6SV8KArj4lZAarNSTsaz2W5w3ngU8SJa5PghJ7PLV j21cIo8JgsYOP+Sq+zxtDozb8ViiUum/t8ZgtaIs3/V3Y1IMa8aTo2NuZGP1ri9M7ZSn lWX6oLzpKVw+5+mV965HiBuxY2joj7Koylc/YDFUg2dDvxWM1/Jk8oL5KCtHK8LPo9Nt ro37uP+Pm8BIgzZmKxapVlFk6+Ppp6RUohpc+Ww8oGCILozzzlPGoAxG42tavTkKKnrk kF/Nd0VRGh66RW90zSAmn9AjR8XEgM7mGvosjo6GOZtLjvYj1iZ3C3V0LvzJDAxatJzi FdSg== Received: by 10.42.29.4 with SMTP id p4mr14410857icc.30.1343127887995; Tue, 24 Jul 2012 04:04:47 -0700 (PDT) Received: from yakj.usersys.redhat.com (93-34-189-113.ip51.fastwebnet.it. [93.34.189.113]) by mx.google.com with ESMTPS id if4sm1752561igc.10.2012.07.24.04.04.45 (version=TLSv1/SSLv3 cipher=OTHER); Tue, 24 Jul 2012 04:04:47 -0700 (PDT) From: Paolo Bonzini To: qemu-devel@nongnu.org Date: Tue, 24 Jul 2012 13:03:42 +0200 Message-Id: <1343127865-16608-5-git-send-email-pbonzini@redhat.com> X-Mailer: git-send-email 1.7.10.4 In-Reply-To: <1343127865-16608-1-git-send-email-pbonzini@redhat.com> References: <1343127865-16608-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.160.173 Cc: kwolf@redhat.com, jcody@redhat.com, eblake@redhat.com, stefanha@linux.vnet.ibm.com Subject: [Qemu-devel] [PATCH 04/47] 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 query-block-jobs. Signed-off-by: Paolo Bonzini --- blockdev.c | 15 ++------------- blockjob.c | 11 +++++++++++ blockjob.h | 8 ++++++++ 3 files changed, 21 insertions(+), 13 deletions(-) diff --git a/blockdev.c b/blockdev.c index e066f8f..dc099f9 100644 --- a/blockdev.c +++ b/blockdev.c @@ -1166,19 +1166,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..a947a6e 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_new(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 1b4c7be..347a62f 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. *