qemu-devel.nongnu.org archive mirror
 help / color / mirror / Atom feed
From: Max Reitz <mreitz@redhat.com>
To: qemu-devel@nongnu.org
Cc: Kevin Wolf <kwolf@redhat.com>,
	Stefan Hajnoczi <stefanha@redhat.com>,
	Max Reitz <mreitz@redhat.com>
Subject: [Qemu-devel] [PATCH v3 7/8] qcow2_check: Mark image consistent
Date: Fri, 30 Aug 2013 09:46:57 +0200	[thread overview]
Message-ID: <1377848818-2623-8-git-send-email-mreitz@redhat.com> (raw)
In-Reply-To: <1377848818-2623-1-git-send-email-mreitz@redhat.com>

If no corruptions remain after an image repair (and no errors have been
encountered), clear the corrupt flag in qcow2_check.

Signed-off-by: Max Reitz <mreitz@redhat.com>
---
 block/qcow2.c | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/block/qcow2.c b/block/qcow2.c
index 3a95ff1..aeb2ebb 100644
--- a/block/qcow2.c
+++ b/block/qcow2.c
@@ -312,7 +312,11 @@ static int qcow2_check(BlockDriverState *bs, BdrvCheckResult *result,
     }
 
     if (fix && result->check_errors == 0 && result->corruptions == 0) {
-        return qcow2_mark_clean(bs);
+        ret = qcow2_mark_clean(bs);
+        if (ret < 0) {
+            return ret;
+        }
+        return qcow2_mark_consistent(bs);
     }
     return ret;
 }
-- 
1.8.3.1

  parent reply	other threads:[~2013-08-30  7:47 UTC|newest]

Thread overview: 12+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2013-08-30  7:46 [Qemu-devel] [PATCH v3 0/8] Add metadata overlap checks Max Reitz
2013-08-30  7:46 ` [Qemu-devel] [PATCH v3 1/8] qcow2: Add corrupt bit Max Reitz
2013-08-30  7:46 ` [Qemu-devel] [PATCH v3 2/8] qcow2: Metadata overlap checks Max Reitz
2013-08-30  7:46 ` [Qemu-devel] [PATCH v3 3/8] qcow2: Employ metadata " Max Reitz
2013-08-30  7:46 ` [Qemu-devel] [PATCH v3 4/8] qcow2-refcount: Move OFLAG_COPIED checks Max Reitz
2013-08-30  8:48   ` Kevin Wolf
2013-08-30  9:39     ` Max Reitz
2013-08-30  7:46 ` [Qemu-devel] [PATCH v3 5/8] qcow2-refcount: Repair OFLAG_COPIED errors Max Reitz
2013-08-30  7:46 ` [Qemu-devel] [PATCH v3 6/8] qcow2-refcount: Repair shared refcount blocks Max Reitz
2013-08-30  7:46 ` Max Reitz [this message]
2013-08-30  7:46 ` [Qemu-devel] [PATCH v3 8/8] qemu-iotests: Overlapping cluster allocations Max Reitz
2013-08-30  9:02 ` [Qemu-devel] [PATCH v3 0/8] Add metadata overlap checks Kevin Wolf

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=1377848818-2623-8-git-send-email-mreitz@redhat.com \
    --to=mreitz@redhat.com \
    --cc=kwolf@redhat.com \
    --cc=qemu-devel@nongnu.org \
    --cc=stefanha@redhat.com \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).