[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH v2 1/7] vmdk: fix return values of vmdk_parent_open
From: |
Paolo Bonzini |
Subject: |
[Qemu-devel] [PATCH v2 1/7] vmdk: fix return values of vmdk_parent_open |
Date: |
Thu, 20 Oct 2011 13:16:19 +0200 |
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 <address@hidden>
---
block/vmdk.c | 15 +++++++++------
1 files changed, 9 insertions(+), 6 deletions(-)
diff --git a/block/vmdk.c b/block/vmdk.c
index 5d16ec4..ea00938 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;
--
1.7.6
- [Qemu-devel] [PATCH v2 0/7] finish coroutinization of drivers, Paolo Bonzini, 2011/10/20
- [Qemu-devel] [PATCH v2 1/7] vmdk: fix return values of vmdk_parent_open,
Paolo Bonzini <=
- [Qemu-devel] [PATCH v2 2/7] vmdk: clean up open, Paolo Bonzini, 2011/10/20
- [Qemu-devel] [PATCH v2 3/7] block: add a CoMutex to synchronous read drivers, Paolo Bonzini, 2011/10/20
- [Qemu-devel] [PATCH v2 4/7] block: take lock around bdrv_read implementations, Paolo Bonzini, 2011/10/20
- [Qemu-devel] [PATCH v2 5/7] block: take lock around bdrv_write implementations, Paolo Bonzini, 2011/10/20
- [Qemu-devel] [PATCH v2 6/7] block: change flush to co_flush, Paolo Bonzini, 2011/10/20
- [Qemu-devel] [PATCH v2 7/7] block: change discard to co_discard, Paolo Bonzini, 2011/10/20
- Re: [Qemu-devel] [PATCH v2 0/7] finish coroutinization of drivers, Kevin Wolf, 2011/10/21