[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [6694] block: Polish error handling of brdv_open2 (Jan Kisz
From: |
Anthony Liguori |
Subject: |
[Qemu-devel] [6694] block: Polish error handling of brdv_open2 (Jan Kiszka) |
Date: |
Thu, 05 Mar 2009 19:42:11 +0000 |
Revision: 6694
http://svn.sv.gnu.org/viewvc/?view=rev&root=qemu&revision=6694
Author: aliguori
Date: 2009-03-05 19:42:11 +0000 (Thu, 05 Mar 2009)
Log Message:
-----------
block: Polish error handling of brdv_open2 (Jan Kiszka)
Make sure that we always delete temporary disk images on error, remove
obsolete malloc error checks and return proper error codes.
Signed-off-by: Jan Kiszka <address@hidden>
Signed-off-by: Anthony Liguori <address@hidden>
Modified Paths:
--------------
branches/stable_0_10_0/block.c
Modified: branches/stable_0_10_0/block.c
===================================================================
--- branches/stable_0_10_0/block.c 2009-03-05 19:42:07 UTC (rev 6693)
+++ branches/stable_0_10_0/block.c 2009-03-05 19:42:11 UTC (rev 6694)
@@ -311,8 +311,6 @@
int ret;
bs = bdrv_new("");
- if (!bs)
- return -ENOMEM;
ret = bdrv_open2(bs, filename, flags | BDRV_O_FILE, NULL);
if (ret < 0) {
bdrv_delete(bs);
@@ -349,12 +347,10 @@
/* if there is a backing file, use it */
bs1 = bdrv_new("");
- if (!bs1) {
- return -ENOMEM;
- }
- if (bdrv_open(bs1, filename, 0) < 0) {
+ ret = bdrv_open(bs1, filename, 0);
+ if (ret < 0) {
bdrv_delete(bs1);
- return -1;
+ return ret;
}
total_size = bdrv_getlength(bs1) >> SECTOR_BITS;
@@ -372,9 +368,10 @@
else
realpath(filename, backing_filename);
- if (bdrv_create(&bdrv_qcow2, tmp_filename,
- total_size, backing_filename, 0) < 0) {
- return -1;
+ ret = bdrv_create(&bdrv_qcow2, tmp_filename,
+ total_size, backing_filename, 0);
+ if (ret < 0) {
+ return ret;
}
filename = tmp_filename;
bs->is_temporary = 1;
@@ -383,15 +380,13 @@
pstrcpy(bs->filename, sizeof(bs->filename), filename);
if (flags & BDRV_O_FILE) {
drv = find_protocol(filename);
- if (!drv)
- return -ENOENT;
- } else {
- if (!drv) {
- drv = find_image_format(filename);
- if (!drv)
- return -1;
- }
+ } else if (!drv) {
+ drv = find_image_format(filename);
}
+ if (!drv) {
+ ret = -ENOENT;
+ goto unlink_and_fail;
+ }
bs->drv = drv;
bs->opaque = qemu_mallocz(drv->instance_size);
/* Note: for compatibility, we open disk image files as RDWR, and
@@ -409,6 +404,9 @@
qemu_free(bs->opaque);
bs->opaque = NULL;
bs->drv = NULL;
+ unlink_and_fail:
+ if (bs->is_temporary)
+ unlink(filename);
return ret;
}
if (drv->bdrv_getlength) {
@@ -422,15 +420,13 @@
if (bs->backing_file[0] != '\0') {
/* if there is a backing file, use it */
bs->backing_hd = bdrv_new("");
- if (!bs->backing_hd) {
- fail:
- bdrv_close(bs);
- return -ENOMEM;
- }
path_combine(backing_filename, sizeof(backing_filename),
filename, bs->backing_file);
- if (bdrv_open(bs->backing_hd, backing_filename, open_flags) < 0)
- goto fail;
+ ret = bdrv_open(bs->backing_hd, backing_filename, open_flags);
+ if (ret < 0) {
+ bdrv_close(bs);
+ return ret;
+ }
}
/* call the change callback */
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Qemu-devel] [6694] block: Polish error handling of brdv_open2 (Jan Kiszka),
Anthony Liguori <=