diff options
| author | Kevin Wolf <kwolf@redhat.com> | 2010-01-20 15:03:03 +0100 |
|---|---|---|
| committer | Anthony Liguori <aliguori@us.ibm.com> | 2010-01-26 14:59:19 -0600 |
| commit | f2b7c8b37045e0e030ef027cfb6d574558fb732a (patch) | |
| tree | ac13554b4a4c6676b7b07d23e90fd77fcc3dd956 | |
| parent | 9a8c4cceaf670193270995b95378faa3867db999 (diff) | |
| download | qemu-f2b7c8b37045e0e030ef027cfb6d574558fb732a.tar.gz qemu-f2b7c8b37045e0e030ef027cfb6d574558fb732a.tar.bz2 qemu-f2b7c8b37045e0e030ef027cfb6d574558fb732a.zip | |
qcow2: Fix error handling in grow_refcount_table
Return the appropriate error code instead of -EIO.
Signed-off-by: Kevin Wolf <kwolf@redhat.com>
Signed-off-by: Anthony Liguori <aliguori@us.ibm.com>
| -rw-r--r-- | 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 3a2d44a170..6f449c6a70 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; } |