From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:32900) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1VQXnE-0008HF-JV for qemu-devel@nongnu.org; Mon, 30 Sep 2013 03:21:27 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1VQXn7-0004NP-Av for qemu-devel@nongnu.org; Mon, 30 Sep 2013 03:21:20 -0400 Received: from mx1.redhat.com ([209.132.183.28]:23042) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1VQXn7-0004NL-2z for qemu-devel@nongnu.org; Mon, 30 Sep 2013 03:21:13 -0400 Received: from int-mx01.intmail.prod.int.phx2.redhat.com (int-mx01.intmail.prod.int.phx2.redhat.com [10.5.11.11]) by mx1.redhat.com (8.14.4/8.14.4) with ESMTP id r8U7LCSe005834 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=OK) for ; Mon, 30 Sep 2013 03:21:12 -0400 From: Max Reitz Date: Mon, 30 Sep 2013 09:21:07 +0200 Message-Id: <1380525667-8703-1-git-send-email-mreitz@redhat.com> Subject: [Qemu-devel] [PATCH] qcow2: CHECK_OFLAG_COPIED is obsolete List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Cc: Kevin Wolf , Stefan Hajnoczi , Max Reitz CHECK_OFLAG_COPIED as a parameter to check_refcounts_l1 and check_refcounts_l2 is obselete now, since the OFLAG_COPIED consistency check is actually no longer performed by these functions (but by check_oflag_copied). Signed-off-by: Max Reitz --- block/qcow2-refcount.c | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/block/qcow2-refcount.c b/block/qcow2-refcount.c index d2b7064..c0b4184 100644 --- a/block/qcow2-refcount.c +++ b/block/qcow2-refcount.c @@ -1034,7 +1034,6 @@ static void inc_refcounts(BlockDriverState *bs, /* Flags for check_refcounts_l1() and check_refcounts_l2() */ enum { - CHECK_OFLAG_COPIED = 0x1, /* check QCOW_OFLAG_COPIED matches refcount */ CHECK_FRAG_INFO = 0x2, /* update BlockFragInfo counters */ }; @@ -1481,8 +1480,7 @@ int qcow2_check_refcounts(BlockDriverState *bs, BdrvCheckResult *res, /* current L1 table */ ret = check_refcounts_l1(bs, res, refcount_table, nb_clusters, - s->l1_table_offset, s->l1_size, - CHECK_OFLAG_COPIED | CHECK_FRAG_INFO); + s->l1_table_offset, s->l1_size, CHECK_FRAG_INFO); if (ret < 0) { goto fail; } -- 1.8.3.1