From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43) id 1O5KrT-0007Zz-Mr for qemu-devel@nongnu.org; Fri, 23 Apr 2010 11:32:11 -0400 Received: from [140.186.70.92] (port=50437 helo=eggs.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1O5KrP-0007WS-8J for qemu-devel@nongnu.org; Fri, 23 Apr 2010 11:32:10 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.69) (envelope-from ) id 1O5KrM-0005vd-7N for qemu-devel@nongnu.org; Fri, 23 Apr 2010 11:32:07 -0400 Received: from mx1.redhat.com ([209.132.183.28]:2671) by eggs.gnu.org with esmtp (Exim 4.69) (envelope-from ) id 1O5KrL-0005vF-T3 for qemu-devel@nongnu.org; Fri, 23 Apr 2010 11:32:04 -0400 From: Kevin Wolf Date: Fri, 23 Apr 2010 17:30:46 +0200 Message-Id: <1272036658-26776-15-git-send-email-kwolf@redhat.com> In-Reply-To: <1272036658-26776-1-git-send-email-kwolf@redhat.com> References: <1272036658-26776-1-git-send-email-kwolf@redhat.com> Subject: [Qemu-devel] [PATCH 14/26] qcow2: Return 0/-errno in write_l1_entry List-Id: qemu-devel.nongnu.org List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , 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; -- 1.6.6.1