From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([140.186.70.92]:52583) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1RJ2an-00083f-Dv for qemu-devel@nongnu.org; Wed, 26 Oct 2011 08:28:29 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1RJ2al-0008CG-FI for qemu-devel@nongnu.org; Wed, 26 Oct 2011 08:28:25 -0400 Received: from mx1.redhat.com ([209.132.183.28]:3680) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1RJ2al-0008Bu-7W for qemu-devel@nongnu.org; Wed, 26 Oct 2011 08:28:23 -0400 Received: from int-mx10.intmail.prod.int.phx2.redhat.com (int-mx10.intmail.prod.int.phx2.redhat.com [10.5.11.23]) by mx1.redhat.com (8.14.4/8.14.4) with ESMTP id p9QCSMZc030566 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=OK) for ; Wed, 26 Oct 2011 08:28:22 -0400 From: Kevin Wolf Date: Wed, 26 Oct 2011 14:31:21 +0200 Message-Id: <1319632282-22725-7-git-send-email-kwolf@redhat.com> In-Reply-To: <1319632282-22725-1-git-send-email-kwolf@redhat.com> References: <1319632282-22725-1-git-send-email-kwolf@redhat.com> Subject: [Qemu-devel] [PATCH 6/7] vmdk: Improve error handling List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Cc: kwolf@redhat.com Return the right error values in some more places. Signed-off-by: Kevin Wolf --- block/vmdk.c | 21 +++++++++++++++------ 1 files changed, 15 insertions(+), 6 deletions(-) diff --git a/block/vmdk.c b/block/vmdk.c index 6cdbfb7..fa0e8bd 100644 --- a/block/vmdk.c +++ b/block/vmdk.c @@ -212,8 +212,10 @@ static uint32_t vmdk_read_cid(BlockDriverState *bs, int parent) const char *p_name, *cid_str; size_t cid_str_size; BDRVVmdkState *s = bs->opaque; + int ret; - if (bdrv_pread(bs->file, s->desc_offset, desc, DESC_SIZE) != DESC_SIZE) { + ret = bdrv_pread(bs->file, s->desc_offset, desc, DESC_SIZE); + if (ret < 0) { return 0; } @@ -239,10 +241,12 @@ static int vmdk_write_cid(BlockDriverState *bs, uint32_t cid) char desc[DESC_SIZE], tmp_desc[DESC_SIZE]; char *p_name, *tmp_str; BDRVVmdkState *s = bs->opaque; + int ret; memset(desc, 0, sizeof(desc)); - if (bdrv_pread(bs->file, s->desc_offset, desc, DESC_SIZE) != DESC_SIZE) { - return -EIO; + ret = bdrv_pread(bs->file, s->desc_offset, desc, DESC_SIZE); + if (ret < 0) { + return ret; } tmp_str = strstr(desc, "parentCID"); @@ -254,9 +258,11 @@ static int vmdk_write_cid(BlockDriverState *bs, uint32_t cid) pstrcat(desc, sizeof(desc), tmp_desc); } - if (bdrv_pwrite_sync(bs->file, s->desc_offset, desc, DESC_SIZE) < 0) { - return -EIO; + ret = bdrv_pwrite_sync(bs->file, s->desc_offset, desc, DESC_SIZE); + if (ret < 0) { + return ret; } + return 0; } @@ -1109,7 +1115,10 @@ static int vmdk_write(BlockDriverState *bs, int64_t sector_num, /* update CID on the first write every time the virtual disk is * opened */ if (!s->cid_updated) { - vmdk_write_cid(bs, time(NULL)); + ret = vmdk_write_cid(bs, time(NULL)); + if (ret < 0) { + return ret; + } s->cid_updated = true; } } -- 1.7.6.4