|
 |
9ae3a8 |
From 7cc09be75f219d045f060ffd60e6c29125a82a8f Mon Sep 17 00:00:00 2001
|
|
|
9ae3a8 |
From: Max Reitz <mreitz@redhat.com>
|
|
|
9ae3a8 |
Date: Mon, 4 Nov 2013 22:32:24 +0100
|
|
|
9ae3a8 |
Subject: [PATCH 31/87] qcow2: CHECK_OFLAG_COPIED is obsolete
|
|
|
9ae3a8 |
|
|
|
9ae3a8 |
RH-Author: Max Reitz <mreitz@redhat.com>
|
|
|
9ae3a8 |
Message-id: <1383604354-12743-34-git-send-email-mreitz@redhat.com>
|
|
|
9ae3a8 |
Patchwork-id: 55333
|
|
|
9ae3a8 |
O-Subject: [RHEL-7.0 qemu-kvm PATCH 33/43] qcow2: CHECK_OFLAG_COPIED is obsolete
|
|
|
9ae3a8 |
Bugzilla: 1004347
|
|
|
9ae3a8 |
RH-Acked-by: Kevin Wolf <kwolf@redhat.com>
|
|
|
9ae3a8 |
RH-Acked-by: Laszlo Ersek <lersek@redhat.com>
|
|
|
9ae3a8 |
RH-Acked-by: Fam Zheng <famz@redhat.com>
|
|
|
9ae3a8 |
RH-Acked-by: Stefan Hajnoczi <stefanha@redhat.com>
|
|
|
9ae3a8 |
|
|
|
9ae3a8 |
BZ: 1004347
|
|
|
9ae3a8 |
|
|
|
9ae3a8 |
CHECK_OFLAG_COPIED as a parameter to check_refcounts_l1 and
|
|
|
9ae3a8 |
check_refcounts_l2 is obselete now, since the OFLAG_COPIED consistency
|
|
|
9ae3a8 |
check is actually no longer performed by these functions (but by
|
|
|
9ae3a8 |
check_oflag_copied).
|
|
|
9ae3a8 |
|
|
|
9ae3a8 |
Signed-off-by: Max Reitz <mreitz@redhat.com>
|
|
|
9ae3a8 |
Reviewed-by: Kevin Wolf <kwolf@redhat.com>
|
|
|
9ae3a8 |
Signed-off-by: Stefan Hajnoczi <stefanha@redhat.com>
|
|
|
9ae3a8 |
(cherry picked from commit db0749012b3d1cf655bddb3cc79052a0fd4dc97b)
|
|
|
9ae3a8 |
|
|
|
9ae3a8 |
Signed-off-by: Max Reitz <mreitz@redhat.com>
|
|
|
9ae3a8 |
---
|
|
|
9ae3a8 |
block/qcow2-refcount.c | 4 +---
|
|
|
9ae3a8 |
1 file changed, 1 insertion(+), 3 deletions(-)
|
|
|
9ae3a8 |
|
|
|
9ae3a8 |
Signed-off-by: Miroslav Rezanina <mrezanin@redhat.com>
|
|
|
9ae3a8 |
---
|
|
|
9ae3a8 |
block/qcow2-refcount.c | 4 +---
|
|
|
9ae3a8 |
1 files changed, 1 insertions(+), 3 deletions(-)
|
|
|
9ae3a8 |
|
|
|
9ae3a8 |
diff --git a/block/qcow2-refcount.c b/block/qcow2-refcount.c
|
|
|
9ae3a8 |
index 927bdeb..2a589b8 100644
|
|
|
9ae3a8 |
--- a/block/qcow2-refcount.c
|
|
|
9ae3a8 |
+++ b/block/qcow2-refcount.c
|
|
|
9ae3a8 |
@@ -1016,7 +1016,6 @@ static void inc_refcounts(BlockDriverState *bs,
|
|
|
9ae3a8 |
|
|
|
9ae3a8 |
/* Flags for check_refcounts_l1() and check_refcounts_l2() */
|
|
|
9ae3a8 |
enum {
|
|
|
9ae3a8 |
- CHECK_OFLAG_COPIED = 0x1, /* check QCOW_OFLAG_COPIED matches refcount */
|
|
|
9ae3a8 |
CHECK_FRAG_INFO = 0x2, /* update BlockFragInfo counters */
|
|
|
9ae3a8 |
};
|
|
|
9ae3a8 |
|
|
|
9ae3a8 |
@@ -1463,8 +1462,7 @@ int qcow2_check_refcounts(BlockDriverState *bs, BdrvCheckResult *res,
|
|
|
9ae3a8 |
|
|
|
9ae3a8 |
/* current L1 table */
|
|
|
9ae3a8 |
ret = check_refcounts_l1(bs, res, refcount_table, nb_clusters,
|
|
|
9ae3a8 |
- s->l1_table_offset, s->l1_size,
|
|
|
9ae3a8 |
- CHECK_OFLAG_COPIED | CHECK_FRAG_INFO);
|
|
|
9ae3a8 |
+ s->l1_table_offset, s->l1_size, CHECK_FRAG_INFO);
|
|
|
9ae3a8 |
if (ret < 0) {
|
|
|
9ae3a8 |
goto fail;
|
|
|
9ae3a8 |
}
|
|
|
9ae3a8 |
--
|
|
|
9ae3a8 |
1.7.1
|
|
|
9ae3a8 |
|