From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([208.118.235.92]:43748) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1S4yGC-0001TK-Qe for qemu-devel@nongnu.org; Tue, 06 Mar 2012 12:33:22 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1S4yFh-00055U-Kc for qemu-devel@nongnu.org; Tue, 06 Mar 2012 12:33:16 -0500 Received: from mail-ww0-f53.google.com ([74.125.82.53]:43745) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1S4yFh-00053q-Bf for qemu-devel@nongnu.org; Tue, 06 Mar 2012 12:32:45 -0500 Received: by mail-ww0-f53.google.com with SMTP id fm10so3536306wgb.10 for ; Tue, 06 Mar 2012 09:32:44 -0800 (PST) From: =?UTF-8?q?Beno=C3=AEt=20Canet?= Date: Tue, 6 Mar 2012 18:32:26 +0100 Message-Id: <1331055149-10982-8-git-send-email-benoit.canet@gmail.com> In-Reply-To: <1331055149-10982-1-git-send-email-benoit.canet@gmail.com> References: <1331055149-10982-1-git-send-email-benoit.canet@gmail.com> Subject: [Qemu-devel] [RFC PATCH 07/10] qed: extract image checking into check_image_if_needed List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Cc: pbonzini@redhat.com, =?UTF-8?q?Beno=C3=AEt=20Canet?= , stefanha@linux.vnet.ibm.com, wolf@redhat.com Signed-off-by: Benoit Canet --- block/qed.c | 55 ++++++++++++++++++++++++++++++++++--------------------- 1 files changed, 34 insertions(+), 21 deletions(-) diff --git a/block/qed.c b/block/qed.c index a041d31..25558fc 100644 --- a/block/qed.c +++ b/block/qed.c @@ -367,6 +367,37 @@ static void qed_cancel_need_check_timer(BDRVQEDState *s) qemu_del_timer(s->need_check_timer); } +static int check_image_if_needed(BlockDriverState *bs) +{ + int ret; + BDRVQEDState *s = bs->opaque; + + if (s->header.features & QED_F_NEED_CHECK) { + /* Read-only images cannot be fixed. There is no risk of corruption + * since write operations are not possible. Therefore, allow + * potentially inconsistent images to be opened read-only. This can + * aid data recovery from an otherwise inconsistent image. + */ + if (!bdrv_is_read_only(bs->file)) { + BdrvCheckResult result = {0}; + + ret = qed_check(s, &result, true); + if (ret) { + return ret; + } + if (!result.corruptions && !result.check_errors) { + /* Ensure fixes reach storage before clearing check bit */ + bdrv_flush(s->bs); + + s->header.features &= ~QED_F_NEED_CHECK; + qed_write_header_sync(s); + } + } + } + + return 0; +} + static int bdrv_qed_open(BlockDriverState *bs, int flags) { BDRVQEDState *s = bs->opaque; @@ -471,27 +502,9 @@ static int bdrv_qed_open(BlockDriverState *bs, int flags) } /* If image was not closed cleanly, check consistency */ - if (s->header.features & QED_F_NEED_CHECK) { - /* Read-only images cannot be fixed. There is no risk of corruption - * since write operations are not possible. Therefore, allow - * potentially inconsistent images to be opened read-only. This can - * aid data recovery from an otherwise inconsistent image. - */ - if (!bdrv_is_read_only(bs->file)) { - BdrvCheckResult result = {0}; - - ret = qed_check(s, &result, true); - if (ret) { - goto out; - } - if (!result.corruptions && !result.check_errors) { - /* Ensure fixes reach storage before clearing check bit */ - bdrv_flush(s->bs); - - s->header.features &= ~QED_F_NEED_CHECK; - qed_write_header_sync(s); - } - } + ret = check_image_if_needed(bs); + if (ret) { + goto out; } s->need_check_timer = qemu_new_timer_ns(vm_clock, -- 1.7.7.6