Blame SOURCES/kvm-qcow2-Split-fail-code-in-L1-and-L2-checks.patch

05bba0
From f3113f5709ae7c1f1ca25b6075662c49fc415ca7 Mon Sep 17 00:00:00 2001
05bba0
From: Max Reitz <mreitz@redhat.com>
05bba0
Date: Sat, 13 Jun 2015 16:22:16 +0200
05bba0
Subject: [PATCH 22/42] qcow2: Split fail code in L1 and L2 checks
05bba0
05bba0
Message-id: <1434212556-3927-23-git-send-email-mreitz@redhat.com>
05bba0
Patchwork-id: 66041
05bba0
O-Subject: [RHEL-7.2 qemu-kvm PATCH 22/42] qcow2: Split fail code in L1 and L2 checks
05bba0
Bugzilla: 1129893
05bba0
RH-Acked-by: Jeffrey Cody <jcody@redhat.com>
05bba0
RH-Acked-by: Fam Zheng <famz@redhat.com>
05bba0
RH-Acked-by: Stefan Hajnoczi <stefanha@redhat.com>
05bba0
05bba0
BZ: 1129893
05bba0
05bba0
Instead of printing out an error message, incrementing check_errors and
05bba0
returning a fixed -errno, just do cleanups and return -ret, with ret set
05bba0
by the code which threw the exception (jumped to the fail label).
05bba0
05bba0
Also, increment check_errors on error in check_refcounts_l2().
05bba0
05bba0
Signed-off-by: Max Reitz <mreitz@redhat.com>
05bba0
Signed-off-by: Kevin Wolf <kwolf@redhat.com>
05bba0
(cherry picked from commit ad27390c85c50df402c7ec0d3864fc43e6559fb3)
05bba0
Signed-off-by: Miroslav Rezanina <mrezanin@redhat.com>
05bba0
05bba0
Conflicts:
05bba0
	block/qcow2-refcount.c
05bba0
05bba0
One conflict because of g_malloc() downstream instead of g_try_malloc()
05bba0
(contextual); I fixed up the context because there was no real reason
05bba0
not to.
05bba0
05bba0
Signed-off-by: Max Reitz <mreitz@redhat.com>
05bba0
---
05bba0
 block/qcow2-refcount.c | 29 +++++++++++++++++++----------
05bba0
 1 file changed, 19 insertions(+), 10 deletions(-)
05bba0
05bba0
diff --git a/block/qcow2-refcount.c b/block/qcow2-refcount.c
05bba0
index 7e2bb7d..0dac4c9 100644
05bba0
--- a/block/qcow2-refcount.c
05bba0
+++ b/block/qcow2-refcount.c
05bba0
@@ -1105,14 +1105,18 @@ static int check_refcounts_l2(BlockDriverState *bs, BdrvCheckResult *res,
05bba0
     BDRVQcowState *s = bs->opaque;
05bba0
     uint64_t *l2_table, l2_entry;
05bba0
     uint64_t next_contiguous_offset = 0;
05bba0
-    int i, l2_size, nb_csectors;
05bba0
+    int i, l2_size, nb_csectors, ret;
05bba0
 
05bba0
     /* Read L2 table from disk */
05bba0
     l2_size = s->l2_size * sizeof(uint64_t);
05bba0
     l2_table = g_malloc(l2_size);
05bba0
 
05bba0
-    if (bdrv_pread(bs->file, l2_offset, l2_table, l2_size) != l2_size)
05bba0
+    ret = bdrv_pread(bs->file, l2_offset, l2_table, l2_size);
05bba0
+    if (ret < 0) {
05bba0
+        fprintf(stderr, "ERROR: I/O error in check_refcounts_l2\n");
05bba0
+        res->check_errors++;
05bba0
         goto fail;
05bba0
+    }
05bba0
 
05bba0
     /* Do the actual checks */
05bba0
     for(i = 0; i < s->l2_size; i++) {
05bba0
@@ -1193,9 +1197,8 @@ static int check_refcounts_l2(BlockDriverState *bs, BdrvCheckResult *res,
05bba0
     return 0;
05bba0
 
05bba0
 fail:
05bba0
-    fprintf(stderr, "ERROR: I/O error in check_refcounts_l2\n");
05bba0
     g_free(l2_table);
05bba0
-    return -EIO;
05bba0
+    return ret;
05bba0
 }
05bba0
 
05bba0
 /*
05bba0
@@ -1227,10 +1230,18 @@ static int check_refcounts_l1(BlockDriverState *bs,
05bba0
     if (l1_size2 == 0) {
05bba0
         l1_table = NULL;
05bba0
     } else {
05bba0
-        l1_table = g_malloc(l1_size2);
05bba0
-        if (bdrv_pread(bs->file, l1_table_offset,
05bba0
-                       l1_table, l1_size2) != l1_size2)
05bba0
+        l1_table = g_try_malloc(l1_size2);
05bba0
+        if (l1_table == NULL) {
05bba0
+            ret = -ENOMEM;
05bba0
+            res->check_errors++;
05bba0
+            goto fail;
05bba0
+        }
05bba0
+        ret = bdrv_pread(bs->file, l1_table_offset, l1_table, l1_size2);
05bba0
+        if (ret < 0) {
05bba0
+            fprintf(stderr, "ERROR: I/O error in check_refcounts_l1\n");
05bba0
+            res->check_errors++;
05bba0
             goto fail;
05bba0
+        }
05bba0
         for(i = 0;i < l1_size; i++)
05bba0
             be64_to_cpus(&l1_table[i]);
05bba0
     }
05bba0
@@ -1263,10 +1274,8 @@ static int check_refcounts_l1(BlockDriverState *bs,
05bba0
     return 0;
05bba0
 
05bba0
 fail:
05bba0
-    fprintf(stderr, "ERROR: I/O error in check_refcounts_l1\n");
05bba0
-    res->check_errors++;
05bba0
     g_free(l1_table);
05bba0
-    return -EIO;
05bba0
+    return ret;
05bba0
 }
05bba0
 
05bba0
 /*
05bba0
-- 
05bba0
1.8.3.1
05bba0