diff options
| author | Paolo Bonzini <pbonzini@redhat.com> | 2011-10-20 13:16:19 +0200 |
|---|---|---|
| committer | Kevin Wolf <kwolf@redhat.com> | 2011-10-21 17:34:13 +0200 |
| commit | 588b65a37abf7bbe47c3a7243a871d83fa1aa66b (patch) | |
| tree | 1c81bde3c7e7c1ceee58db8d22164825e9e0fdaf /block | |
| parent | 34d4260e1846d69d7241f690534e3dd4b3e6fd5b (diff) | |
vmdk: fix return values of vmdk_parent_open
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 <pbonzini@redhat.com>
Signed-off-by: Kevin Wolf <kwolf@redhat.com>
Diffstat (limited to 'block')
| -rw-r--r-- | block/vmdk.c | 15 |
1 files changed, 9 insertions, 6 deletions
diff --git a/block/vmdk.c b/block/vmdk.c index 5d16ec49bc..ea00938755 100644 --- a/block/vmdk.c +++ b/block/vmdk.c @@ -283,10 +283,12 @@ static int vmdk_parent_open(BlockDriverState *bs) char *p_name; char desc[DESC_SIZE + 1]; BDRVVmdkState *s = bs->opaque; + int ret; desc[DESC_SIZE] = '\0'; - if (bdrv_pread(bs->file, s->desc_offset, desc, DESC_SIZE) != DESC_SIZE) { - return -1; + ret = bdrv_pread(bs->file, s->desc_offset, desc, DESC_SIZE); + if (ret < 0) { + return ret; } p_name = strstr(desc, "parentFileNameHint"); @@ -296,10 +298,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 +631,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; |