|
 |
9ae3a8 |
From be34caa9498a41766cdedf43613edf2e9600d896 Mon Sep 17 00:00:00 2001
|
|
|
9ae3a8 |
From: Max Reitz <mreitz@redhat.com>
|
|
|
9ae3a8 |
Date: Sat, 13 Jun 2015 16:22:13 +0200
|
|
|
9ae3a8 |
Subject: [PATCH 19/42] qcow2: Use sizeof(**refcount_table)
|
|
|
9ae3a8 |
|
|
|
9ae3a8 |
Message-id: <1434212556-3927-20-git-send-email-mreitz@redhat.com>
|
|
|
9ae3a8 |
Patchwork-id: 66038
|
|
|
9ae3a8 |
O-Subject: [RHEL-7.2 qemu-kvm PATCH 19/42] qcow2: Use sizeof(**refcount_table)
|
|
|
9ae3a8 |
Bugzilla: 1129893
|
|
|
9ae3a8 |
RH-Acked-by: Jeffrey Cody <jcody@redhat.com>
|
|
|
9ae3a8 |
RH-Acked-by: Fam Zheng <famz@redhat.com>
|
|
|
9ae3a8 |
RH-Acked-by: Stefan Hajnoczi <stefanha@redhat.com>
|
|
|
9ae3a8 |
|
|
|
9ae3a8 |
BZ: 1129893
|
|
|
9ae3a8 |
|
|
|
9ae3a8 |
When implementing variable refcounts, we want to be able to easily find
|
|
|
9ae3a8 |
all the places in qemu which are tied to a certain refcount order.
|
|
|
9ae3a8 |
Replace sizeof(uint16_t) in the check code by sizeof(**refcount_table)
|
|
|
9ae3a8 |
so we can later find it more easily.
|
|
|
9ae3a8 |
|
|
|
9ae3a8 |
Signed-off-by: Max Reitz <mreitz@redhat.com>
|
|
|
9ae3a8 |
Reviewed-by: Eric Blake <eblake@redhat.com>
|
|
|
9ae3a8 |
Signed-off-by: Kevin Wolf <kwolf@redhat.com>
|
|
|
9ae3a8 |
(cherry picked from commit 78fb328e854542d79bebe54f3a426cba6d46dbf1)
|
|
|
9ae3a8 |
|
|
|
9ae3a8 |
Signed-off-by: Max Reitz <mreitz@redhat.com>
|
|
|
9ae3a8 |
Signed-off-by: Miroslav Rezanina <mrezanin@redhat.com>
|
|
|
9ae3a8 |
---
|
|
|
9ae3a8 |
block/qcow2-refcount.c | 2 +-
|
|
|
9ae3a8 |
1 file changed, 1 insertion(+), 1 deletion(-)
|
|
|
9ae3a8 |
|
|
|
9ae3a8 |
diff --git a/block/qcow2-refcount.c b/block/qcow2-refcount.c
|
|
|
9ae3a8 |
index 08b2b62..cb78f05 100644
|
|
|
9ae3a8 |
--- a/block/qcow2-refcount.c
|
|
|
9ae3a8 |
+++ b/block/qcow2-refcount.c
|
|
|
9ae3a8 |
@@ -1613,7 +1613,7 @@ static int check_refblocks(BlockDriverState *bs, BdrvCheckResult *res,
|
|
|
9ae3a8 |
*nb_clusters);
|
|
|
9ae3a8 |
memset(&(*refcount_table)[old_nb_clusters], 0,
|
|
|
9ae3a8 |
(*nb_clusters - old_nb_clusters) *
|
|
|
9ae3a8 |
- sizeof(uint16_t));
|
|
|
9ae3a8 |
+ sizeof(**refcount_table));
|
|
|
9ae3a8 |
}
|
|
|
9ae3a8 |
(*refcount_table)[cluster]--;
|
|
|
9ae3a8 |
inc_refcounts(bs, res, *refcount_table, *nb_clusters,
|
|
|
9ae3a8 |
--
|
|
|
9ae3a8 |
1.8.3.1
|
|
|
9ae3a8 |
|