From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43) id 1Nz8rx-0002OE-3U for qemu-devel@nongnu.org; Tue, 06 Apr 2010 09:31:05 -0400 Received: from [140.186.70.92] (port=34514 helo=eggs.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1Nz8rt-0002Kp-6S for qemu-devel@nongnu.org; Tue, 06 Apr 2010 09:31:04 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.69) (envelope-from ) id 1Nz8rq-0006rF-M4 for qemu-devel@nongnu.org; Tue, 06 Apr 2010 09:31:01 -0400 Received: from mx1.redhat.com ([209.132.183.28]:62528) by eggs.gnu.org with esmtp (Exim 4.69) (envelope-from ) id 1Nz8rq-0006qV-Ar for qemu-devel@nongnu.org; Tue, 06 Apr 2010 09:30:58 -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 o36DUu7k017526 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=OK) for ; Tue, 6 Apr 2010 09:30:56 -0400 From: Kevin Wolf Date: Tue, 6 Apr 2010 15:30:10 +0200 Message-Id: <1270560614-31030-3-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 2/6] qcow2: Return 0/-errno in write_l2_entries 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_l2_entries to return the real error code instead of -1. Signed-off-by: Kevin Wolf --- 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