[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PULL 13/32] qcow2: Split fail code in L1 and L2 checks
From: |
Kevin Wolf |
Subject: |
[Qemu-devel] [PULL 13/32] qcow2: Split fail code in L1 and L2 checks |
Date: |
Thu, 23 Oct 2014 22:42:20 +0200 |
From: Max Reitz <address@hidden>
Instead of printing out an error message, incrementing check_errors and
returning a fixed -errno, just do cleanups and return -ret, with ret set
by the code which threw the exception (jumped to the fail label).
Also, increment check_errors on error in check_refcounts_l2().
Signed-off-by: Max Reitz <address@hidden>
Signed-off-by: Kevin Wolf <address@hidden>
---
block/qcow2-refcount.c | 23 ++++++++++++++---------
1 file changed, 14 insertions(+), 9 deletions(-)
diff --git a/block/qcow2-refcount.c b/block/qcow2-refcount.c
index a3f4d47..59fb400 100644
--- a/block/qcow2-refcount.c
+++ b/block/qcow2-refcount.c
@@ -1133,14 +1133,18 @@ static int check_refcounts_l2(BlockDriverState *bs,
BdrvCheckResult *res,
BDRVQcowState *s = bs->opaque;
uint64_t *l2_table, l2_entry;
uint64_t next_contiguous_offset = 0;
- int i, l2_size, nb_csectors;
+ int i, l2_size, nb_csectors, ret;
/* Read L2 table from disk */
l2_size = s->l2_size * sizeof(uint64_t);
l2_table = g_malloc(l2_size);
- if (bdrv_pread(bs->file, l2_offset, l2_table, l2_size) != l2_size)
+ ret = bdrv_pread(bs->file, l2_offset, l2_table, l2_size);
+ if (ret < 0) {
+ fprintf(stderr, "ERROR: I/O error in check_refcounts_l2\n");
+ res->check_errors++;
goto fail;
+ }
/* Do the actual checks */
for(i = 0; i < s->l2_size; i++) {
@@ -1221,9 +1225,8 @@ static int check_refcounts_l2(BlockDriverState *bs,
BdrvCheckResult *res,
return 0;
fail:
- fprintf(stderr, "ERROR: I/O error in check_refcounts_l2\n");
g_free(l2_table);
- return -EIO;
+ return ret;
}
/*
@@ -1258,11 +1261,15 @@ static int check_refcounts_l1(BlockDriverState *bs,
l1_table = g_try_malloc(l1_size2);
if (l1_table == NULL) {
ret = -ENOMEM;
+ res->check_errors++;
goto fail;
}
- if (bdrv_pread(bs->file, l1_table_offset,
- l1_table, l1_size2) != l1_size2)
+ ret = bdrv_pread(bs->file, l1_table_offset, l1_table, l1_size2);
+ if (ret < 0) {
+ fprintf(stderr, "ERROR: I/O error in check_refcounts_l1\n");
+ res->check_errors++;
goto fail;
+ }
for(i = 0;i < l1_size; i++)
be64_to_cpus(&l1_table[i]);
}
@@ -1295,10 +1302,8 @@ static int check_refcounts_l1(BlockDriverState *bs,
return 0;
fail:
- fprintf(stderr, "ERROR: I/O error in check_refcounts_l1\n");
- res->check_errors++;
g_free(l1_table);
- return -EIO;
+ return ret;
}
/*
--
1.8.3.1
- [Qemu-devel] [PULL 01/32] MAINTAINERS: add aio to block layer, (continued)
- [Qemu-devel] [PULL 01/32] MAINTAINERS: add aio to block layer, Kevin Wolf, 2014/10/23
- [Qemu-devel] [PULL 05/32] block: qemu-iotests change _supported_proto to file once more., Kevin Wolf, 2014/10/23
- [Qemu-devel] [PULL 02/32] MAINTAINERS: qemu-iotests belongs to the block layer, Kevin Wolf, 2014/10/23
- [Qemu-devel] [PULL 06/32] block: Add qemu_{,try_}blockalign0(), Kevin Wolf, 2014/10/23
- [Qemu-devel] [PULL 04/32] block/vdi: Use {DIV_,}ROUND_UP, Kevin Wolf, 2014/10/23
- [Qemu-devel] [PULL 08/32] qcow2: Fix leaks in dirty images, Kevin Wolf, 2014/10/23
- [Qemu-devel] [PULL 07/32] qcow2: Calculate refcount block entry count, Kevin Wolf, 2014/10/23
- [Qemu-devel] [PULL 09/32] qcow2: Split qcow2_check_refcounts(), Kevin Wolf, 2014/10/23
- [Qemu-devel] [PULL 10/32] qcow2: Use sizeof(**refcount_table), Kevin Wolf, 2014/10/23
- [Qemu-devel] [PULL 11/32] qcow2: Pull check_refblocks() up, Kevin Wolf, 2014/10/23
- [Qemu-devel] [PULL 13/32] qcow2: Split fail code in L1 and L2 checks,
Kevin Wolf <=
- [Qemu-devel] [PULL 12/32] qcow2: Use int64_t for in-memory reftable size, Kevin Wolf, 2014/10/23
- [Qemu-devel] [PULL 14/32] qcow2: Let inc_refcounts() return -errno, Kevin Wolf, 2014/10/23
- [Qemu-devel] [PULL 16/32] qcow2: Reuse refcount table in calculate_refcounts(), Kevin Wolf, 2014/10/23
- [Qemu-devel] [PULL 15/32] qcow2: Let inc_refcounts() resize the reftable, Kevin Wolf, 2014/10/23
- [Qemu-devel] [PULL 17/32] qcow2: Fix refcount blocks beyond image end, Kevin Wolf, 2014/10/23
- [Qemu-devel] [PULL 18/32] qcow2: Do not perform potentially damaging repairs, Kevin Wolf, 2014/10/23
- [Qemu-devel] [PULL 20/32] qcow2: Clean up after refcount rebuild, Kevin Wolf, 2014/10/23
- [Qemu-devel] [PULL 19/32] qcow2: Rebuild refcount structure during check, Kevin Wolf, 2014/10/23
- [Qemu-devel] [PULL 21/32] iotests: Fix test outputs, Kevin Wolf, 2014/10/23
- [Qemu-devel] [PULL 22/32] iotests: Add test for potentially damaging repairs, Kevin Wolf, 2014/10/23