aboutsummaryrefslogtreecommitdiff
path: root/block
diff options
context:
space:
mode:
authorJuan Quintela <quintela@redhat.com>2010-03-04 10:00:37 +0100
committerAnthony Liguori <aliguori@us.ibm.com>2010-03-09 11:23:00 -0600
commit3829cb460cff65ca8af956db66b697d96076f8e1 (patch)
treeb6fdd161d4fb8768bc1602aed1ff7ca2a226abdd /block
parenta161329b61106ab093aab6d3227ac85e0b8251a9 (diff)
downloadqemu-3829cb460cff65ca8af956db66b697d96076f8e1.zip
qemu-3829cb460cff65ca8af956db66b697d96076f8e1.tar.gz
qemu-3829cb460cff65ca8af956db66b697d96076f8e1.tar.bz2
vmdk: share cleanup code
cleanup code is identical for error/success cases. Only difference are goto labels. Signed-off-by: Juan Quintela <quintela@redhat.com> Signed-off-by: Anthony Liguori <aliguori@us.ibm.com>
Diffstat (limited to 'block')
-rw-r--r--block/vmdk.c13
1 files changed, 4 insertions, 9 deletions
diff --git a/block/vmdk.c b/block/vmdk.c
index 819c1c9..007fca4 100644
--- a/block/vmdk.c
+++ b/block/vmdk.c
@@ -334,18 +334,13 @@ static int vmdk_snapshot_create(const char *filename, const char *backing_file)
ret = -errno;
goto fail_gd;
}
- qemu_free(gd_buf);
- qemu_free(rgd_buf);
-
- close(p_fd);
- close(snp_fd);
- return 0;
+ ret = 0;
- fail_gd:
+fail_gd:
qemu_free(gd_buf);
- fail_rgd:
+fail_rgd:
qemu_free(rgd_buf);
- fail:
+fail:
close(p_fd);
close(snp_fd);
return ret;