From patchwork Fri Jul 10 03:46:44 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Fam Zheng X-Patchwork-Id: 493623 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from lists.gnu.org (lists.gnu.org [IPv6:2001:4830:134:3::11]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 7F24B1402B5 for ; Fri, 10 Jul 2015 13:51:13 +1000 (AEST) Received: from localhost ([::1]:42841 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1ZDPLD-0005nB-Nq for incoming@patchwork.ozlabs.org; Thu, 09 Jul 2015 23:51:11 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:50621) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1ZDPHl-0007mO-0j for qemu-devel@nongnu.org; Thu, 09 Jul 2015 23:47:38 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1ZDPHh-00075v-S4 for qemu-devel@nongnu.org; Thu, 09 Jul 2015 23:47:36 -0400 Received: from mx1.redhat.com ([209.132.183.28]:33435) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1ZDPHh-00075n-NF for qemu-devel@nongnu.org; Thu, 09 Jul 2015 23:47:33 -0400 Received: from int-mx13.intmail.prod.int.phx2.redhat.com (int-mx13.intmail.prod.int.phx2.redhat.com [10.5.11.26]) by mx1.redhat.com (Postfix) with ESMTPS id 500F33187C8; Fri, 10 Jul 2015 03:47:33 +0000 (UTC) Received: from ad.nay.redhat.com. (dhcp-15-42.nay.redhat.com [10.66.15.42]) by int-mx13.intmail.prod.int.phx2.redhat.com (8.14.4/8.14.4) with ESMTP id t6A3krVi027673; Thu, 9 Jul 2015 23:47:29 -0400 From: Fam Zheng To: qemu-devel@nongnu.org Date: Fri, 10 Jul 2015 11:46:44 +0800 Message-Id: <1436500012-32593-8-git-send-email-famz@redhat.com> In-Reply-To: <1436500012-32593-1-git-send-email-famz@redhat.com> References: <1436500012-32593-1-git-send-email-famz@redhat.com> X-Scanned-By: MIMEDefang 2.68 on 10.5.11.26 X-detected-operating-system: by eggs.gnu.org: GNU/Linux 3.x X-Received-From: 209.132.183.28 Cc: Kevin Wolf , famz@redhat.com, John Snow , Jeff Cody , Max Reitz , vsementsov@parallels.com, stefanha@redhat.com Subject: [Qemu-devel] [PATCH v3 07/15] blockjob: Add "completed" and "ret" in BlockJob 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 They are set when block_job_completed is called. Signed-off-by: Fam Zheng Reviewed-by: John Snow --- blockjob.c | 3 +++ include/block/blockjob.h | 9 +++++++++ 2 files changed, 12 insertions(+) diff --git a/blockjob.c b/blockjob.c index 62bb906..fb1d9e7 100644 --- a/blockjob.c +++ b/blockjob.c @@ -89,6 +89,9 @@ void block_job_completed(BlockJob *job, int ret) BlockDriverState *bs = job->bs; assert(bs->job == job); + assert(!job->completed); + job->completed = true; + job->ret = ret; job->cb(job->opaque, ret); block_job_release(bs); } diff --git a/include/block/blockjob.h b/include/block/blockjob.h index a7b7f66..40d0776 100644 --- a/include/block/blockjob.h +++ b/include/block/blockjob.h @@ -134,6 +134,15 @@ struct BlockJob { /** The opaque value that is passed to the completion function. */ void *opaque; + + /* True if this job has reported completion by calling block_job_completed. + */ + bool completed; + + /* ret code passed to block_job_completed. + */ + int ret; + }; /**