From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([140.186.70.92]:36650) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1RGXdD-00031h-Vq for qemu-devel@nongnu.org; Wed, 19 Oct 2011 11:00:42 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1RGXct-0006Gh-Rc for qemu-devel@nongnu.org; Wed, 19 Oct 2011 11:00:28 -0400 Received: from mail-qy0-f173.google.com ([209.85.216.173]:33390) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1RGXct-0006GE-G7 for qemu-devel@nongnu.org; Wed, 19 Oct 2011 11:00:15 -0400 Received: by mail-qy0-f173.google.com with SMTP id 10so4228308qyk.4 for ; Wed, 19 Oct 2011 08:00:15 -0700 (PDT) Sender: Paolo Bonzini From: Paolo Bonzini Date: Wed, 19 Oct 2011 16:59:52 +0200 Message-Id: <1319036398-14320-3-git-send-email-pbonzini@redhat.com> In-Reply-To: <1319036398-14320-1-git-send-email-pbonzini@redhat.com> References: <1319036398-14320-1-git-send-email-pbonzini@redhat.com> Subject: [Qemu-devel] [PATCH 2/8] vmdk: fix return values of vmdk_parent_open List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Cc: kwolf@redhat.com, stefanha@linux.vnet.ibm.com While vmdk_open_desc_file (touched by the patch) correctly changed -1 to -EINVAL, vmdk_open did not. Fix it directly in vmdk_parent_open. Signed-off-by: Paolo Bonzini --- block/vmdk.c | 11 ++++++----- 1 files changed, 6 insertions(+), 5 deletions(-) diff --git a/block/vmdk.c b/block/vmdk.c index 5d16ec4..21566eb 100644 --- a/block/vmdk.c +++ b/block/vmdk.c @@ -286,7 +286,7 @@ static int vmdk_parent_open(BlockDriverState *bs) desc[DESC_SIZE] = '\0'; if (bdrv_pread(bs->file, s->desc_offset, desc, DESC_SIZE) != DESC_SIZE) { - return -1; + return -EINVAL; } p_name = strstr(desc, "parentFileNameHint"); @@ -296,10 +296,10 @@ static int vmdk_parent_open(BlockDriverState *bs) p_name += sizeof("parentFileNameHint") + 1; end_name = strchr(p_name, '\"'); if (end_name == NULL) { - return -1; + return -EINVAL; } if ((end_name - p_name) > sizeof(bs->backing_file) - 1) { - return -1; + return -EINVAL; } pstrcpy(bs->backing_file, end_name - p_name + 1, p_name); @@ -629,9 +629,10 @@ static int vmdk_open_desc_file(BlockDriverState *bs, int flags, } /* try to open parent images, if exist */ - if (vmdk_parent_open(bs)) { + ret = vmdk_parent_open(bs); + if (ret) { vmdk_free_extents(bs); - return -EINVAL; + return ret; } s->parent_cid = vmdk_read_cid(bs, 1); return 0; -- 1.7.6