From patchwork Fri Apr 23 15:30:46 2010 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: [14/26] qcow2: Return 0/-errno in write_l1_entry Date: Fri, 23 Apr 2010 05:30:46 -0000 From: Kevin Wolf X-Patchwork-Id: 50835 Message-Id: <1272036658-26776-15-git-send-email-kwolf@redhat.com> To: aliguori@linux.vnet.ibm.com Cc: kwolf@redhat.com, qemu-devel@nongnu.org Change write_l1_entry to return the real error code instead of -1. Signed-off-by: Kevin Wolf --- 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 d2774d1..d5c52a9 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;