|
 |
9ae3a8 |
From 2f67e26a87ace81cb7a9c122c39f4d8d667d69d1 Mon Sep 17 00:00:00 2001
|
|
|
9ae3a8 |
From: Max Reitz <mreitz@redhat.com>
|
|
|
9ae3a8 |
Date: Sat, 13 Jun 2015 16:22:19 +0200
|
|
|
9ae3a8 |
Subject: [PATCH 25/42] qcow2: Reuse refcount table in calculate_refcounts()
|
|
|
9ae3a8 |
MIME-Version: 1.0
|
|
|
9ae3a8 |
Content-Type: text/plain; charset=UTF-8
|
|
|
9ae3a8 |
Content-Transfer-Encoding: 8bit
|
|
|
9ae3a8 |
|
|
|
9ae3a8 |
Message-id: <1434212556-3927-26-git-send-email-mreitz@redhat.com>
|
|
|
9ae3a8 |
Patchwork-id: 66044
|
|
|
9ae3a8 |
O-Subject: [RHEL-7.2 qemu-kvm PATCH 25/42] qcow2: Reuse refcount table in calculate_refcounts()
|
|
|
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 |
We will later call calculate_refcounts multiple times, so reuse the
|
|
|
9ae3a8 |
refcount table if possible.
|
|
|
9ae3a8 |
|
|
|
9ae3a8 |
Signed-off-by: Max Reitz <mreitz@redhat.com>
|
|
|
9ae3a8 |
Reviewed-by: Benoît Canet <benoit.canet@nodalink.com>
|
|
|
9ae3a8 |
Reviewed-by: Kevin Wolf <kwolf@redhat.com>
|
|
|
9ae3a8 |
Signed-off-by: Kevin Wolf <kwolf@redhat.com>
|
|
|
9ae3a8 |
(cherry picked from commit 9696df219a71c6608f058ade8873d6d0b4e352fe)
|
|
|
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 | 12 +++++++-----
|
|
|
9ae3a8 |
1 file changed, 7 insertions(+), 5 deletions(-)
|
|
|
9ae3a8 |
|
|
|
9ae3a8 |
diff --git a/block/qcow2-refcount.c b/block/qcow2-refcount.c
|
|
|
9ae3a8 |
index 7d03e65..8f1215c 100644
|
|
|
9ae3a8 |
--- a/block/qcow2-refcount.c
|
|
|
9ae3a8 |
+++ b/block/qcow2-refcount.c
|
|
|
9ae3a8 |
@@ -1631,10 +1631,12 @@ static int calculate_refcounts(BlockDriverState *bs, BdrvCheckResult *res,
|
|
|
9ae3a8 |
QCowSnapshot *sn;
|
|
|
9ae3a8 |
int ret;
|
|
|
9ae3a8 |
|
|
|
9ae3a8 |
- *refcount_table = g_try_new0(uint16_t, *nb_clusters);
|
|
|
9ae3a8 |
- if (*nb_clusters && *refcount_table == NULL) {
|
|
|
9ae3a8 |
- res->check_errors++;
|
|
|
9ae3a8 |
- return -ENOMEM;
|
|
|
9ae3a8 |
+ if (!*refcount_table) {
|
|
|
9ae3a8 |
+ *refcount_table = g_try_new0(uint16_t, *nb_clusters);
|
|
|
9ae3a8 |
+ if (*nb_clusters && *refcount_table == NULL) {
|
|
|
9ae3a8 |
+ res->check_errors++;
|
|
|
9ae3a8 |
+ return -ENOMEM;
|
|
|
9ae3a8 |
+ }
|
|
|
9ae3a8 |
}
|
|
|
9ae3a8 |
|
|
|
9ae3a8 |
/* header */
|
|
|
9ae3a8 |
@@ -1750,7 +1752,7 @@ int qcow2_check_refcounts(BlockDriverState *bs, BdrvCheckResult *res,
|
|
|
9ae3a8 |
{
|
|
|
9ae3a8 |
BDRVQcowState *s = bs->opaque;
|
|
|
9ae3a8 |
int64_t size, highest_cluster, nb_clusters;
|
|
|
9ae3a8 |
- uint16_t *refcount_table;
|
|
|
9ae3a8 |
+ uint16_t *refcount_table = NULL;
|
|
|
9ae3a8 |
int ret;
|
|
|
9ae3a8 |
|
|
|
9ae3a8 |
size = bdrv_getlength(bs->file);
|
|
|
9ae3a8 |
--
|
|
|
9ae3a8 |
1.8.3.1
|
|
|
9ae3a8 |
|