[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH 4/6] qcow2: Return 0/-errno in write_l1_entry
From: |
Kevin Wolf |
Subject: |
[Qemu-devel] [PATCH 4/6] qcow2: Return 0/-errno in write_l1_entry |
Date: |
Tue, 6 Apr 2010 15:30:12 +0200 |
Change write_l1_entry to return the real error code instead of -1.
Signed-off-by: Kevin Wolf <address@hidden>
---
block/qcow2-cluster.c | 10 +++++-----
1 files changed, 5 insertions(+), 5 deletions(-)
diff --git a/block/qcow2-cluster.c b/block/qcow2-cluster.c
index 8cc742b..a2d3962 100644
--- a/block/qcow2-cluster.c
+++ b/block/qcow2-cluster.c
@@ -193,7 +193,7 @@ static int write_l1_entry(BDRVQcowState *s, int l1_index)
{
uint64_t buf[L1_ENTRIES_PER_SECTOR];
int l1_start_index;
- int i;
+ int i, ret;
l1_start_index = l1_index & ~(L1_ENTRIES_PER_SECTOR - 1);
for (i = 0; i < L1_ENTRIES_PER_SECTOR; i++) {
@@ -201,10 +201,10 @@ static int write_l1_entry(BDRVQcowState *s, int l1_index)
}
BLKDBG_EVENT(s->hd, BLKDBG_L1_UPDATE);
- if (bdrv_pwrite(s->hd, s->l1_table_offset + 8 * l1_start_index,
- buf, sizeof(buf)) != sizeof(buf))
- {
- return -1;
+ ret = bdrv_pwrite(s->hd, s->l1_table_offset + 8 * l1_start_index,
+ buf, sizeof(buf));
+ 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, 2010/04/06
- [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 <=
- [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