From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([208.118.235.92]:49051) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1TGu1B-0004KE-Fu for qemu-devel@nongnu.org; Wed, 26 Sep 2012 11:59:26 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1TGu15-0005Jg-Li for qemu-devel@nongnu.org; Wed, 26 Sep 2012 11:59:21 -0400 Received: from mail-pa0-f45.google.com ([209.85.220.45]:44075) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1TGu15-0005Jc-GY for qemu-devel@nongnu.org; Wed, 26 Sep 2012 11:59:15 -0400 Received: by padfb10 with SMTP id fb10so564081pad.4 for ; Wed, 26 Sep 2012 08:59:14 -0700 (PDT) Sender: Paolo Bonzini From: Paolo Bonzini Date: Wed, 26 Sep 2012 17:56:36 +0200 Message-Id: <1348675011-8794-31-git-send-email-pbonzini@redhat.com> In-Reply-To: <1348675011-8794-1-git-send-email-pbonzini@redhat.com> References: <1348675011-8794-1-git-send-email-pbonzini@redhat.com> Subject: [Qemu-devel] [PATCH v2 30/45] iostatus: forward block_job_iostatus_reset to block job List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Cc: kwolf@redhat.com, jcody@redhat.com Signed-off-by: Paolo Bonzini --- block.c | 3 +++ blockjob.c | 3 +++ blockjob.h | 6 +++++- 3 file modificati, 11 inserzioni(+). 1 rimozione(-) diff --git a/block.c b/block.c index 074325d..0f57ec1 100644 --- a/block.c +++ b/block.c @@ -4162,6 +4162,9 @@ void bdrv_iostatus_reset(BlockDriverState *bs) { if (bdrv_iostatus_is_enabled(bs)) { bs->iostatus = BLOCK_DEVICE_IO_STATUS_OK; + if (bs->job) { + block_job_iostatus_reset(bs->job); + } } } diff --git a/blockjob.c b/blockjob.c index 8d2687c..52d290b 100644 --- a/blockjob.c +++ b/blockjob.c @@ -142,6 +142,9 @@ bool block_job_is_cancelled(BlockJob *job) void block_job_iostatus_reset(BlockJob *job) { job->iostatus = BLOCK_DEVICE_IO_STATUS_OK; + if (job->job_type->iostatus_reset) { + job->job_type->iostatus_reset(job); + } } struct BlockCancelData { diff --git a/blockjob.h b/blockjob.h index be37cc1..32bd793 100644 --- a/blockjob.h +++ b/blockjob.h @@ -42,6 +42,9 @@ typedef struct BlockJobType { /** Optional callback for job types that support setting a speed limit */ void (*set_speed)(BlockJob *job, int64_t speed, Error **errp); + /** Optional callback for job types that need to forward I/O status reset */ + void (*iostatus_reset)(BlockJob *job); + /** * Optional callback for job types whose completion must be triggered * manually. @@ -254,7 +257,8 @@ int block_job_cancel_sync(BlockJob *job); * block_job_iostatus_reset: * @job: The job whose I/O status should be reset. * - * Reset I/O status on @job. + * Reset I/O status on @job and on BlockDriverState objects it uses, + * other than job->bs. */ void block_job_iostatus_reset(BlockJob *job); -- 1.7.12