From patchwork Thu Mar 4 09:00:34 2010 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Juan Quintela X-Patchwork-Id: 46896 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 D7325B7CE8 for ; Thu, 4 Mar 2010 20:23:41 +1100 (EST) Received: from localhost ([127.0.0.1]:47858 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1Nn7H7-0007Hq-LM for incoming@patchwork.ozlabs.org; Thu, 04 Mar 2010 04:23:21 -0500 Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43) id 1Nn6vR-0003sm-Ai for qemu-devel@nongnu.org; Thu, 04 Mar 2010 04:00:57 -0500 Received: from [199.232.76.173] (port=45410 helo=monty-python.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1Nn6vQ-0003sL-Bj for qemu-devel@nongnu.org; Thu, 04 Mar 2010 04:00:56 -0500 Received: from Debian-exim by monty-python.gnu.org with spam-scanned (Exim 4.60) (envelope-from ) id 1Nn6vN-0004SW-Vd for qemu-devel@nongnu.org; Thu, 04 Mar 2010 04:00:56 -0500 Received: from mx1.redhat.com ([209.132.183.28]:14951) by monty-python.gnu.org with esmtp (Exim 4.60) (envelope-from ) id 1Nn6vN-0004S9-4b for qemu-devel@nongnu.org; Thu, 04 Mar 2010 04:00:53 -0500 Received: from int-mx04.intmail.prod.int.phx2.redhat.com (int-mx04.intmail.prod.int.phx2.redhat.com [10.5.11.17]) by mx1.redhat.com (8.13.8/8.13.8) with ESMTP id o2490pJA017168 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=OK) for ; Thu, 4 Mar 2010 04:00:51 -0500 Received: from localhost.localdomain (ovpn01.gateway.prod.ext.phx2.redhat.com [10.5.9.1]) by int-mx04.intmail.prod.int.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id o2490etY010016; Thu, 4 Mar 2010 04:00:49 -0500 From: Juan Quintela To: qemu-devel@nongnu.org Date: Thu, 4 Mar 2010 10:00:34 +0100 Message-Id: In-Reply-To: References: In-Reply-To: References: X-Scanned-By: MIMEDefang 2.67 on 10.5.11.17 X-detected-operating-system: by monty-python.gnu.org: Genre and OS details not recognized. Subject: [Qemu-devel] [PATCH 05/10] vmdk: return errno instead of -1 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 Signed-off-by: Juan Quintela --- block/vmdk.c | 14 +++++++------- 1 files changed, 7 insertions(+), 7 deletions(-) diff --git a/block/vmdk.c b/block/vmdk.c index 56c28a0..5b1d197 100644 --- a/block/vmdk.c +++ b/block/vmdk.c @@ -740,7 +740,7 @@ static int vmdk_create(const char *filename, QEMUOptionParameter *options) fd = open(filename, O_WRONLY | O_CREAT | O_TRUNC | O_BINARY | O_LARGEFILE, 0644); if (fd < 0) - return -1; + return -errno; magic = cpu_to_be32(VMDK4_MAGIC); memset(&header, 0, sizeof(header)); header.version = cpu_to_le32(1); @@ -777,18 +777,18 @@ static int vmdk_create(const char *filename, QEMUOptionParameter *options) /* write all the data */ ret = qemu_write_full(fd, &magic, sizeof(magic)); if (ret != sizeof(magic)) { - ret = -1; + ret = -errno; goto exit; } ret = qemu_write_full(fd, &header, sizeof(header)); if (ret != sizeof(header)) { - ret = -1; + ret = -errno; goto exit; } ret = ftruncate(fd, header.grain_offset << 9); if (ret < 0) { - ret = -1; + ret = -errno; goto exit; } @@ -798,7 +798,7 @@ static int vmdk_create(const char *filename, QEMUOptionParameter *options) i < gt_count; i++, tmp += gt_size) { ret = qemu_write_full(fd, &tmp, sizeof(tmp)); if (ret != sizeof(tmp)) { - ret = -1; + ret = -errno; goto exit; } } @@ -809,7 +809,7 @@ static int vmdk_create(const char *filename, QEMUOptionParameter *options) i < gt_count; i++, tmp += gt_size) { ret = qemu_write_full(fd, &tmp, sizeof(tmp)); if (ret != sizeof(tmp)) { - ret = -1; + ret = -errno; goto exit; } } @@ -831,7 +831,7 @@ static int vmdk_create(const char *filename, QEMUOptionParameter *options) lseek(fd, le64_to_cpu(header.desc_offset) << 9, SEEK_SET); ret = qemu_write_full(fd, desc, strlen(desc)); if (ret != strlen(desc)) { - ret = -1; + ret = -errno; goto exit; }