[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH 2/6] qcow2: Return 0/-errno in write_l2_entries
From: |
Kevin Wolf |
Subject: |
[Qemu-devel] [PATCH 2/6] qcow2: Return 0/-errno in write_l2_entries |
Date: |
Tue, 6 Apr 2010 15:30:10 +0200 |
Change write_l2_entries to return the real error code instead of -1.
Signed-off-by: Kevin Wolf <address@hidden>
---
block/qcow2-cluster.c | 9 +++++----
1 files changed, 5 insertions(+), 4 deletions(-)
diff --git a/block/qcow2-cluster.c b/block/qcow2-cluster.c
index 9b3d686..65b16db 100644
--- a/block/qcow2-cluster.c
+++ b/block/qcow2-cluster.c
@@ -627,12 +627,13 @@ static int write_l2_entries(BDRVQcowState *s, uint64_t
*l2_table,
int start_offset = (8 * l2_index) & ~511;
int end_offset = (8 * (l2_index + num) + 511) & ~511;
size_t len = end_offset - start_offset;
+ int ret;
BLKDBG_EVENT(s->hd, BLKDBG_L2_UPDATE);
- if (bdrv_pwrite(s->hd, l2_offset + start_offset, &l2_table[l2_start_index],
- len) != len)
- {
- return -1;
+ ret = bdrv_pwrite(s->hd, l2_offset + start_offset,
+ &l2_table[l2_start_index], len);
+ if (ret < 0) {
+ return ret;
}
return 0;
--
1.6.6.1
- [Qemu-devel] [PATCH 0/6] qcow2: More error path fixes, Kevin Wolf, 2010/04/06
- [Qemu-devel] [PATCH 2/6] qcow2: Return 0/-errno in write_l2_entries,
Kevin Wolf <=
- [Qemu-devel] [PATCH 1/6] qcow2: Don't ignore immediate read/write failures, Kevin Wolf, 2010/04/06
- [Qemu-devel] [PATCH 6/6] qcow2: Remove request from in-flight list after error, Kevin Wolf, 2010/04/06
- [Qemu-devel] [PATCH 4/6] qcow2: Return 0/-errno in write_l1_entry, Kevin Wolf, 2010/04/06
- [Qemu-devel] [PATCH 3/6] qcow2: Fix error return code in qcow2_alloc_cluster_link_l2, Kevin Wolf, 2010/04/06
- [Qemu-devel] [PATCH 5/6] qcow2: Return 0/-errno in l2_allocate, Kevin Wolf, 2010/04/06
- Re: [Qemu-devel] [PATCH 0/6] qcow2: More error path fixes, Aurelien Jarno, 2010/04/09