From patchwork Fri Apr 23 15:30:46 2010 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Kevin Wolf X-Patchwork-Id: 50835 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from lists.gnu.org (lists.gnu.org [199.232.76.165]) (using TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits)) (Client did not present a certificate) by ozlabs.org (Postfix) with ESMTPS id DE031B7D21 for ; Sat, 24 Apr 2010 02:06:31 +1000 (EST) Received: from localhost ([127.0.0.1]:50296 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1O5LOV-0004se-Nu for incoming@patchwork.ozlabs.org; Fri, 23 Apr 2010 12:06:19 -0400 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 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 o3NFW1Rn004048 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=OK); Fri, 23 Apr 2010 11:32:01 -0400 Received: from localhost.localdomain (vpn2-9-155.ams2.redhat.com [10.36.9.155]) by int-mx02.intmail.prod.int.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id o3NFVOCJ020467; Fri, 23 Apr 2010 11:31:59 -0400 From: Kevin Wolf To: aliguori@linux.vnet.ibm.com 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> X-Scanned-By: MIMEDefang 2.67 on 10.5.11.12 X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. Cc: kwolf@redhat.com, qemu-devel@nongnu.org Subject: [Qemu-devel] [PATCH 14/26] qcow2: Return 0/-errno in write_l1_entry X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: qemu-devel.nongnu.org List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@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;