From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([208.118.235.92]:45086) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1ULa38-0002Qj-Pf for qemu-devel@nongnu.org; Fri, 29 Mar 2013 10:12:59 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1ULa37-0003bR-M2 for qemu-devel@nongnu.org; Fri, 29 Mar 2013 10:12:58 -0400 Received: from mx1.redhat.com ([209.132.183.28]:2233) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1ULa37-0003bF-FC for qemu-devel@nongnu.org; Fri, 29 Mar 2013 10:12:57 -0400 Received: from int-mx01.intmail.prod.int.phx2.redhat.com (int-mx01.intmail.prod.int.phx2.redhat.com [10.5.11.11]) by mx1.redhat.com (8.14.4/8.14.4) with ESMTP id r2TECvwE014256 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=OK) for ; Fri, 29 Mar 2013 10:12:57 -0400 From: Pavel Hrdina Date: Fri, 29 Mar 2013 15:12:35 +0100 Message-Id: <6d3caeb8c5fdb663a24c9549ef6d74db77823516.1364565637.git.phrdina@redhat.com> In-Reply-To: References: In-Reply-To: References: Subject: [Qemu-devel] [PATCH v4 08/11] qemu-img: introduce qemu_img_handle_error List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Cc: phrdina@redhat.com, armbru@redhat.com, lcapitulino@redhat.com Signed-off-by: Pavel Hrdina Reviewed-by: Eric Blake --- 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