[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH 3/8] vmdk: clean up open
From: |
Paolo Bonzini |
Subject: |
[Qemu-devel] [PATCH 3/8] vmdk: clean up open |
Date: |
Wed, 19 Oct 2011 16:59:53 +0200 |
Signed-off-by: Paolo Bonzini <address@hidden>
---
block/vmdk.c | 37 +++++++++++++++----------------------
1 files changed, 15 insertions(+), 22 deletions(-)
diff --git a/block/vmdk.c b/block/vmdk.c
index 21566eb..12b38d2 100644
--- a/block/vmdk.c
+++ b/block/vmdk.c
@@ -622,20 +622,7 @@ static int vmdk_open_desc_file(BlockDriverState *bs, int
flags,
return -ENOTSUP;
}
s->desc_offset = 0;
- ret = vmdk_parse_extents(buf, bs, bs->file->filename);
- if (ret) {
- vmdk_free_extents(bs);
- return ret;
- }
-
- /* try to open parent images, if exist */
- ret = vmdk_parent_open(bs);
- if (ret) {
- vmdk_free_extents(bs);
- return ret;
- }
- s->parent_cid = vmdk_read_cid(bs, 1);
- return 0;
+ return vmdk_parse_extents(buf, bs, bs->file->filename);
}
static int vmdk_open(BlockDriverState *bs, int flags)
@@ -645,17 +632,23 @@ static int vmdk_open(BlockDriverState *bs, int flags)
if (vmdk_open_sparse(bs, bs->file, flags) == 0) {
s->desc_offset = 0x200;
- /* try to open parent images, if exist */
- ret = vmdk_parent_open(bs);
+ } else {
+ ret = vmdk_open_desc_file(bs, flags, 0);
if (ret) {
- vmdk_free_extents(bs);
- return ret;
+ goto fail;
}
- s->parent_cid = vmdk_read_cid(bs, 1);
- return 0;
- } else {
- return vmdk_open_desc_file(bs, flags, 0);
}
+ /* try to open parent images, if exist */
+ ret = vmdk_parent_open(bs);
+ if (ret) {
+ goto fail;
+ }
+ s->parent_cid = vmdk_read_cid(bs, 1);
+ return ret;
+
+fail:
+ vmdk_free_extents(bs);
+ return ret;
}
static int get_whole_cluster(BlockDriverState *bs,
--
1.7.6
- [Qemu-devel] [PATCH 0/8] finish coroutinization of drivers, Paolo Bonzini, 2011/10/19
- [Qemu-devel] [PATCH 4/8] block: add a Rwlock to synchronous read/write drivers, Paolo Bonzini, 2011/10/19
- [Qemu-devel] [PATCH 5/8] block: take lock around bdrv_read implementations, Paolo Bonzini, 2011/10/19
- [Qemu-devel] [PATCH 2/8] vmdk: fix return values of vmdk_parent_open, Paolo Bonzini, 2011/10/19
- [Qemu-devel] [PATCH 6/8] block: take lock around bdrv_write implementations, Paolo Bonzini, 2011/10/19
- [Qemu-devel] [PATCH 7/8] block: change flush to co_flush, Paolo Bonzini, 2011/10/19