From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43) id 1Nz8s9-0002Tt-2Y for qemu-devel@nongnu.org; Tue, 06 Apr 2010 09:31:17 -0400 Received: from [140.186.70.92] (port=34565 helo=eggs.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1Nz8rv-0002MM-3S for qemu-devel@nongnu.org; Tue, 06 Apr 2010 09:31:16 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.69) (envelope-from ) id 1Nz8rr-0006sL-UL for qemu-devel@nongnu.org; Tue, 06 Apr 2010 09:31:02 -0400 Received: from mx1.redhat.com ([209.132.183.28]:9692) by eggs.gnu.org with esmtp (Exim 4.69) (envelope-from ) id 1Nz8rr-0006rk-In for qemu-devel@nongnu.org; Tue, 06 Apr 2010 09:30:59 -0400 Received: from int-mx02.intmail.prod.int.phx2.redhat.com (int-mx02.intmail.prod.int.phx2.redhat.com [10.5.11.12]) by mx1.redhat.com (8.13.8/8.13.8) with ESMTP id o36DUw8k028111 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=OK) for ; Tue, 6 Apr 2010 09:30:58 -0400 From: Kevin Wolf Date: Tue, 6 Apr 2010 15:30:12 +0200 Message-Id: <1270560614-31030-5-git-send-email-kwolf@redhat.com> In-Reply-To: <1270560614-31030-1-git-send-email-kwolf@redhat.com> References: <1270560614-31030-1-git-send-email-kwolf@redhat.com> Subject: [Qemu-devel] [PATCH 4/6] 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: qemu-devel@nongnu.org Cc: kwolf@redhat.com 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 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