From patchwork Fri Mar 29 14:12:35 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Pavel Hrdina X-Patchwork-Id: 232430 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from lists.gnu.org (lists.gnu.org [208.118.235.17]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (Client did not present a certificate) by ozlabs.org (Postfix) with ESMTPS id 96CB62C0095 for ; Sat, 30 Mar 2013 01:17:46 +1100 (EST) Received: from localhost ([::1]:35002 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1ULa7k-0001pA-Pr for incoming@patchwork.ozlabs.org; Fri, 29 Mar 2013 10:17:44 -0400 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 Received: from localhost.localdomain.com (vpn1-6-110.ams2.redhat.com [10.36.6.110]) by int-mx01.intmail.prod.int.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id r2TECc3Y031878; Fri, 29 Mar 2013 10:12:55 -0400 From: Pavel Hrdina To: qemu-devel@nongnu.org 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: X-Scanned-By: MIMEDefang 2.67 on 10.5.11.11 X-detected-operating-system: by eggs.gnu.org: GNU/Linux 3.x X-Received-From: 209.132.183.28 Cc: phrdina@redhat.com, armbru@redhat.com, lcapitulino@redhat.com Subject: [Qemu-devel] [PATCH v4 08/11] qemu-img: introduce qemu_img_handle_error X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Sender: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org 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)