[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [RFC 5/7] qemu-img: img_create(): use Error object
From: |
Luiz Capitulino |
Subject: |
[Qemu-devel] [RFC 5/7] qemu-img: img_create(): use Error object |
Date: |
Thu, 11 Oct 2012 18:27:03 -0300 |
Signed-off-by: Luiz Capitulino <address@hidden>
---
qemu-img.c | 12 ++++++++----
1 file changed, 8 insertions(+), 4 deletions(-)
diff --git a/qemu-img.c b/qemu-img.c
index 99b8ad1..18885c6 100644
--- a/qemu-img.c
+++ b/qemu-img.c
@@ -302,6 +302,7 @@ static int img_create(int argc, char **argv)
const char *base_filename = NULL;
char *options = NULL;
QEMUOptionParameter *params = NULL;
+ Error *local_err = NULL;
for(;;) {
c = getopt(argc, argv, "F:b:f:he6o:");
@@ -362,9 +363,12 @@ static int img_create(int argc, char **argv)
goto out;
}
- ret = bdrv_img_create(filename, fmt, base_filename, base_fmt,
- options, img_size, BDRV_O_FLAGS, ¶ms, NULL);
- if (ret == 0 && params) {
+ bdrv_img_create(filename, fmt, base_filename, base_fmt,
+ options, img_size, BDRV_O_FLAGS, ¶ms, &local_err);
+ if (error_is_set(&local_err)) {
+ fprintf(stderr, "qemu-img create: %s\n", error_get_pretty(local_err));
+ error_free(local_err);
+ } else if (params) {
printf("Formatting '%s', fmt=%s ", filename, fmt);
print_option_parameters(params);
free_option_parameters(params);
@@ -372,7 +376,7 @@ static int img_create(int argc, char **argv)
}
out:
- if (ret) {
+ if (ret || error_is_set(&local_err)) {
return 1;
}
return 0;
--
1.7.12.315.g682ce8b
- [Qemu-devel] [RFC 0/7] block: bdrv_img_create(): propagate errors, Luiz Capitulino, 2012/10/11
- [Qemu-devel] [RFC 1/7] error: add error_set_errno and error_setg_errno, Luiz Capitulino, 2012/10/11
- [Qemu-devel] [RFC 2/7] block: bdrv_img_create(): add param_ret argument, Luiz Capitulino, 2012/10/11
- [Qemu-devel] [RFC 3/7] block: bdrv_img_create(): move param printing to qemu-img, Luiz Capitulino, 2012/10/11
- [Qemu-devel] [RFC 5/7] qemu-img: img_create(): use Error object,
Luiz Capitulino <=
- [Qemu-devel] [RFC 4/7] block: bdrv_img_create(): add Error ** argument, Luiz Capitulino, 2012/10/11
- [Qemu-devel] [RFC 6/7] qmp: qmp_transaction(): pass Error object to bdrv_img_create(), Luiz Capitulino, 2012/10/11
- [Qemu-devel] [RFC 7/7] block: bdrv_img_create(): drop unused code, Luiz Capitulino, 2012/10/11
- Re: [Qemu-devel] [RFC 0/7] block: bdrv_img_create(): propagate errors, Paolo Bonzini, 2012/10/12