From patchwork Fri Mar 22 13:16:07 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Pavel Hrdina X-Patchwork-Id: 230017 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 77A832C00A1 for ; Sat, 23 Mar 2013 00:21:17 +1100 (EST) Received: from localhost ([::1]:42846 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1UJ1uF-0003JK-ME for incoming@patchwork.ozlabs.org; Fri, 22 Mar 2013 09:21:15 -0400 Received: from eggs.gnu.org ([208.118.235.92]:44119) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1UJ1pj-0005DW-Uu for qemu-devel@nongnu.org; Fri, 22 Mar 2013 09:16:37 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1UJ1pf-0008BZ-9v for qemu-devel@nongnu.org; Fri, 22 Mar 2013 09:16:35 -0400 Received: from mx1.redhat.com ([209.132.183.28]:56476) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1UJ1pf-0008Aj-3H for qemu-devel@nongnu.org; Fri, 22 Mar 2013 09:16:31 -0400 Received: from int-mx02.intmail.prod.int.phx2.redhat.com (int-mx02.intmail.prod.int.phx2.redhat.com [10.5.11.12]) by mx1.redhat.com (8.14.4/8.14.4) with ESMTP id r2MDGUfl001382 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=OK) for ; Fri, 22 Mar 2013 09:16:30 -0400 Received: from localhost.localdomain.com (vpn1-5-126.ams2.redhat.com [10.36.5.126]) by int-mx02.intmail.prod.int.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id r2MDGBBj008641; Fri, 22 Mar 2013 09:16:29 -0400 From: Pavel Hrdina To: qemu-devel@nongnu.org Date: Fri, 22 Mar 2013 14:16:07 +0100 Message-Id: <30db14a4083032599fe732b07ff5cde2dc190c67.1363957855.git.phrdina@redhat.com> In-Reply-To: References: In-Reply-To: References: X-Scanned-By: MIMEDefang 2.67 on 10.5.11.12 X-detected-operating-system: by eggs.gnu.org: GNU/Linux 3.x X-Received-From: 209.132.183.28 Cc: Pavel Hrdina , armbru@redhat.com, lcapitulino@redhat.com Subject: [Qemu-devel] [PATCH v2 08/12] 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 --- qemu-img.c | 11 +++++++++-- 1 file changed, 9 insertions(+), 2 deletions(-) diff --git a/qemu-img.c b/qemu-img.c index 21d02bf..34badad 100644 --- a/qemu-img.c +++ b/qemu-img.c @@ -322,6 +322,14 @@ static int add_old_style_options(const char *fmt, QEMUOptionParameter *list, return 0; } +static void qemu_img_handle_error(Error *err) +{ + if (error_is_set(&err)) { + error_report("%s", error_get_pretty(err)); + error_free(err); + } +} + static int img_create(int argc, char **argv) { int c; @@ -401,8 +409,7 @@ 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); + qemu_img_handle_error(local_err); return 1; }