[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH 06/10] qcow2: Fix error handling in grow_refcount_ta
From: |
Kevin Wolf |
Subject: |
[Qemu-devel] [PATCH 06/10] qcow2: Fix error handling in grow_refcount_table |
Date: |
Mon, 18 Jan 2010 13:11:32 +0100 |
Return the appropriate error code instead of -EIO.
Signed-off-by: Kevin Wolf <address@hidden>
---
block/qcow2-refcount.c | 9 ++++++---
1 files changed, 6 insertions(+), 3 deletions(-)
diff --git a/block/qcow2-refcount.c b/block/qcow2-refcount.c
index 3a2d44a..6f449c6 100644
--- a/block/qcow2-refcount.c
+++ b/block/qcow2-refcount.c
@@ -168,9 +168,12 @@ static int grow_refcount_table(BlockDriverState *bs, int
min_size)
cpu_to_be64w((uint64_t*)data, table_offset);
cpu_to_be32w((uint32_t*)(data + 8), refcount_table_clusters);
- if (bdrv_pwrite(s->hd, offsetof(QCowHeader, refcount_table_offset),
- data, sizeof(data)) != sizeof(data))
+ ret = bdrv_pwrite(s->hd, offsetof(QCowHeader, refcount_table_offset),
+ data, sizeof(data));
+ if (ret != sizeof(data)) {
goto fail;
+ }
+
qemu_free(s->refcount_table);
old_table_offset = s->refcount_table_offset;
old_table_size = s->refcount_table_size;
@@ -183,7 +186,7 @@ static int grow_refcount_table(BlockDriverState *bs, int
min_size)
return 0;
fail:
qemu_free(new_table);
- return -EIO;
+ return ret < 0 ? ret : -EIO;
}
--
1.6.2.5
- Re: [Qemu-devel] [PATCH 01/10] qcow2: Fix error handling in qcow2_grow_l1_table, (continued)
- [Qemu-devel] [PATCH 03/10] qcow2: Return 0/-errno in get_cluster_table, Kevin Wolf, 2010/01/18
- [Qemu-devel] [PATCH 06/10] qcow2: Fix error handling in grow_refcount_table,
Kevin Wolf <=
- [Qemu-devel] [PATCH 07/10] qcow2: Improve error handling in update_refcount, Kevin Wolf, 2010/01/18
- [Qemu-devel] [PATCH 05/10] block: Return original error codes in bdrv_pread/write, Kevin Wolf, 2010/01/18
- [Qemu-devel] [PATCH 08/10] qcow2: Allow updating no refcounts, Kevin Wolf, 2010/01/18
- [Qemu-devel] [PATCH 10/10] qcow2: Don't ignore qcow2_alloc_clusters return value, Kevin Wolf, 2010/01/18