[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH v3 08/11] qemu-img: introduce qemu_img_handle_error
From: |
Pavel Hrdina |
Subject: |
[Qemu-devel] [PATCH v3 08/11] qemu-img: introduce qemu_img_handle_error |
Date: |
Thu, 28 Mar 2013 17:47:12 +0100 |
Signed-off-by: Pavel Hrdina <address@hidden>
---
qemu-img.c | 18 ++++++++++++------
1 file changed, 12 insertions(+), 6 deletions(-)
diff --git a/qemu-img.c b/qemu-img.c
index 21d02bf..d5f81cc 100644
--- a/qemu-img.c
+++ b/qemu-img.c
@@ -322,6 +322,17 @@ static int add_old_style_options(const char *fmt,
QEMUOptionParameter *list,
return 0;
}
+static int qemu_img_handle_error(Error *err)
+{
+ if (error_is_set(&err)) {
+ error_report("%s", error_get_pretty(err));
+ error_free(err);
+ return 1;
+ }
+
+ return 0;
+}
+
static int img_create(int argc, char **argv)
{
int c;
@@ -400,13 +411,8 @@ static int img_create(int argc, char **argv)
bdrv_img_create(filename, fmt, base_filename, base_fmt,
options, img_size, BDRV_O_FLAGS, &local_err, quiet);
- if (error_is_set(&local_err)) {
- error_report("%s", error_get_pretty(local_err));
- error_free(local_err);
- return 1;
- }
- return 0;
+ return qemu_img_handle_error(local_err);
}
static void dump_json_image_check(ImageCheck *check, bool quiet)
--
1.8.1.4
- [Qemu-devel] [PATCH v3 00/11] convert savevm to use qapi and introduce qmp command, Pavel Hrdina, 2013/03/28
- [Qemu-devel] [PATCH v3 01/11] block: add error parameter to bdrv_snapshot_create() and related functions, Pavel Hrdina, 2013/03/28
- [Qemu-devel] [PATCH v3 02/11] block: add error parameter to del_existing_snapshots(), Pavel Hrdina, 2013/03/28
- [Qemu-devel] [PATCH v3 04/11] savevm: add error parameter to qemu_savevm_state_iterate(), Pavel Hrdina, 2013/03/28
- [Qemu-devel] [PATCH v3 03/11] savevm: add error parameter to qemu_savevm_state_begin(), Pavel Hrdina, 2013/03/28
- [Qemu-devel] [PATCH v3 05/11] savevm: add error parameter to qemu_savevm_state_complete(), Pavel Hrdina, 2013/03/28
- [Qemu-devel] [PATCH v3 06/11] savevm: add error parameter to qemu_savevm_state(), Pavel Hrdina, 2013/03/28
- [Qemu-devel] [PATCH v3 08/11] qemu-img: introduce qemu_img_handle_error,
Pavel Hrdina <=
- [Qemu-devel] [PATCH v3 09/11] block: update return value from bdrv_snapshot_create, Pavel Hrdina, 2013/03/28
- [Qemu-devel] [PATCH v3 10/11] savevm: update return value from qemu_savevm_state, Pavel Hrdina, 2013/03/28
- [Qemu-devel] [PATCH v3 11/11] savevm: add force parameter to HMP command and return snapshot info, Pavel Hrdina, 2013/03/28
- [Qemu-devel] [PATCH v3 07/11] qapi: Convert savevm, Pavel Hrdina, 2013/03/28