From patchwork Thu Oct 18 14:49:27 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Paolo Bonzini X-Patchwork-Id: 192350 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 1E4242C008E for ; Fri, 19 Oct 2012 02:13:04 +1100 (EST) Received: from localhost ([::1]:54313 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1TOrRp-0001NZ-Ep for incoming@patchwork.ozlabs.org; Thu, 18 Oct 2012 10:51:45 -0400 Received: from eggs.gnu.org ([208.118.235.92]:41721) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1TOrRL-0000iu-Of for qemu-devel@nongnu.org; Thu, 18 Oct 2012 10:51:23 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1TOrRC-0008Bn-7G for qemu-devel@nongnu.org; Thu, 18 Oct 2012 10:51:15 -0400 Received: from mail-pb0-f45.google.com ([209.85.160.45]:41103) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1TOrRC-0007US-1k for qemu-devel@nongnu.org; Thu, 18 Oct 2012 10:51:06 -0400 Received: by mail-pb0-f45.google.com with SMTP id rp2so8493742pbb.4 for ; Thu, 18 Oct 2012 07:51:05 -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=0IMe6yE9FCp9G6YfgT+tVNamTVMInPLKzIoSANWlupw=; b=sB0wcLz+1rgjilwAPTJT5A0jm4mnVrY274iqwPHW3I2Kv9OPYua+t8CeMe+mVfyGpN W5wzpqTiG6qDhEPBdV7yOOqoAVfgeX/FUdd+0BcWT+uMimDmPFnnHDO1nC0MTiGQ/s/W JdxEg1A2S5YWK5PM80TWCVur2aFxsyCqsZQAeFpEjtQxTY8yJLOZBCa2jP40KUIhNMkr fy/OERMiX8YQT+jzHhvtI/B4yWv2Kq26Z+DcSa0k5+iYN6Z7/euPV2ZbufBDda7iHg6W nkypy7ZUnQlFTND5am1c6HS27MpHzejW7fbR9/iGoaBK+Vv/2BRjj4JrwixURueaGBkp O5Dg== Received: by 10.66.77.168 with SMTP id t8mr59977251paw.28.1350571865547; Thu, 18 Oct 2012 07:51:05 -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 qb2sm14348236pbb.15.2012.10.18.07.50.59 (version=TLSv1/SSLv3 cipher=OTHER); Thu, 18 Oct 2012 07:51:03 -0700 (PDT) From: Paolo Bonzini To: qemu-devel@nongnu.org Date: Thu, 18 Oct 2012 16:49:27 +0200 Message-Id: <1350571770-9836-14-git-send-email-pbonzini@redhat.com> X-Mailer: git-send-email 1.7.12.1 In-Reply-To: <1350571770-9836-1-git-send-email-pbonzini@redhat.com> References: <1350571770-9836-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.45 Cc: kwolf@redhat.com Subject: [Qemu-devel] [PATCH v3 13/16] iostatus: forward block_job_iostatus_reset to block job 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 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 b167f61..3e76322 100644 --- a/block.c +++ b/block.c @@ -4319,6 +4319,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 fbb7e1c..cda12c6 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 fb2392e..3792b73 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. @@ -253,7 +256,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);