[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH 22/38] bdrv_img_create() use proper errno return val
From: |
Kevin Wolf |
Subject: |
[Qemu-devel] [PATCH 22/38] bdrv_img_create() use proper errno return values |
Date: |
Fri, 17 Dec 2010 18:44:37 +0100 |
From: Jes Sorensen <address@hidden>
Kevin suggested to have bdrv_img_create() return proper -errno values
on error.
Signed-off-by: Jes Sorensen <address@hidden>
Signed-off-by: Kevin Wolf <address@hidden>
---
block.c | 23 ++++++++++-------------
1 files changed, 10 insertions(+), 13 deletions(-)
diff --git a/block.c b/block.c
index 0c14eee..fe07d0b 100644
--- a/block.c
+++ b/block.c
@@ -2773,14 +2773,14 @@ int bdrv_img_create(const char *filename, const char
*fmt,
drv = bdrv_find_format(fmt);
if (!drv) {
error_report("Unknown file format '%s'", fmt);
- ret = -1;
+ ret = -EINVAL;
goto out;
}
proto_drv = bdrv_find_protocol(filename);
if (!proto_drv) {
error_report("Unknown protocol '%s'", filename);
- ret = -1;
+ ret = -EINVAL;
goto out;
}
@@ -2799,7 +2799,7 @@ int bdrv_img_create(const char *filename, const char *fmt,
param = parse_option_parameters(options, create_options, param);
if (param == NULL) {
error_report("Invalid options for file format '%s'.", fmt);
- ret = -1;
+ ret = -EINVAL;
goto out;
}
}
@@ -2809,7 +2809,7 @@ int bdrv_img_create(const char *filename, const char *fmt,
base_filename)) {
error_report("Backing file not supported for file format '%s'",
fmt);
- ret = -1;
+ ret = -EINVAL;
goto out;
}
}
@@ -2818,7 +2818,7 @@ int bdrv_img_create(const char *filename, const char *fmt,
if (set_option_parameter(param, BLOCK_OPT_BACKING_FMT, base_fmt)) {
error_report("Backing file format not supported for file "
"format '%s'", fmt);
- ret = -1;
+ ret = -EINVAL;
goto out;
}
}
@@ -2828,7 +2828,7 @@ int bdrv_img_create(const char *filename, const char *fmt,
if (!strcmp(filename, backing_file->value.s)) {
error_report("Error: Trying to create an image with the "
"same filename as the backing file");
- ret = -1;
+ ret = -EINVAL;
goto out;
}
}
@@ -2838,7 +2838,7 @@ int bdrv_img_create(const char *filename, const char *fmt,
if (!bdrv_find_format(backing_fmt->value.s)) {
error_report("Unknown backing file format '%s'",
backing_fmt->value.s);
- ret = -1;
+ ret = -EINVAL;
goto out;
}
}
@@ -2860,7 +2860,6 @@ int bdrv_img_create(const char *filename, const char *fmt,
ret = bdrv_open(bs, backing_file->value.s, flags, drv);
if (ret < 0) {
error_report("Could not open '%s'", filename);
- ret = -1;
goto out;
}
bdrv_get_geometry(bs, &size);
@@ -2870,7 +2869,7 @@ int bdrv_img_create(const char *filename, const char *fmt,
set_option_parameter(param, BLOCK_OPT_SIZE, buf);
} else {
error_report("Image creation needs a size parameter");
- ret = -1;
+ ret = -EINVAL;
goto out;
}
}
@@ -2901,8 +2900,6 @@ out:
if (bs) {
bdrv_delete(bs);
}
- if (ret) {
- return 1;
- }
- return 0;
+
+ return ret;
}
--
1.7.2.3
- [Qemu-devel] [PATCH 23/38] qemu.img.c: Use error_report() instead of own error() implementation, (continued)
- [Qemu-devel] [PATCH 23/38] qemu.img.c: Use error_report() instead of own error() implementation, Kevin Wolf, 2010/12/17
- [Qemu-devel] [PATCH 36/38] block/qcow2.c: rename qcow_ functions to qcow2_, Kevin Wolf, 2010/12/17
- [Qemu-devel] [PATCH 29/38] raw-posix: add discard support, Kevin Wolf, 2010/12/17
- [Qemu-devel] [PATCH 35/38] qed: Consistency check support, Kevin Wolf, 2010/12/17
- [Qemu-devel] [PATCH 34/38] qed: Read/write support, Kevin Wolf, 2010/12/17
- [Qemu-devel] [PATCH 37/38] Add proper -errno error return values to qcow2_open(), Kevin Wolf, 2010/12/17
- [Qemu-devel] [PATCH 15/38] config: add ahci for pci capable machines, Kevin Wolf, 2010/12/17
- [Qemu-devel] [PATCH 26/38] block: add discard support, Kevin Wolf, 2010/12/17
- [Qemu-devel] [PATCH 33/38] qed: Table, L2 cache, and cluster functions, Kevin Wolf, 2010/12/17
- [Qemu-devel] [PATCH 24/38] Remove NULL checks for bdrv_new return value, Kevin Wolf, 2010/12/17
- [Qemu-devel] [PATCH 22/38] bdrv_img_create() use proper errno return values,
Kevin Wolf <=
- [Qemu-devel] [PATCH 13/38] ahci: add ahci emulation, Kevin Wolf, 2010/12/17
- [Qemu-devel] [PATCH 12/38] pci: add ich9 pci id, Kevin Wolf, 2010/12/17
- [Qemu-devel] [PATCH 08/38] ide: Split out BMDMA code from ATA core, Kevin Wolf, 2010/12/17
- [Qemu-devel] Re: [PULL 00/38] Block patches, Anthony Liguori, 2010/12/17