From patchwork Tue Apr 16 16:05:13 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Pavel Hrdina X-Patchwork-Id: 237021 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 8E9552C00CE for ; Wed, 17 Apr 2013 02:07:52 +1000 (EST) Received: from localhost ([::1]:56191 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1US8QA-0008Fr-IY for incoming@patchwork.ozlabs.org; Tue, 16 Apr 2013 12:07:50 -0400 Received: from eggs.gnu.org ([208.118.235.92]:39496) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1US8Nv-0005Pr-9R for qemu-devel@nongnu.org; Tue, 16 Apr 2013 12:05:33 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1US8Nt-0006sf-W7 for qemu-devel@nongnu.org; Tue, 16 Apr 2013 12:05:31 -0400 Received: from mx1.redhat.com ([209.132.183.28]:2063) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1US8Nt-0006sT-OY for qemu-devel@nongnu.org; Tue, 16 Apr 2013 12:05:29 -0400 Received: from int-mx10.intmail.prod.int.phx2.redhat.com (int-mx10.intmail.prod.int.phx2.redhat.com [10.5.11.23]) by mx1.redhat.com (8.14.4/8.14.4) with ESMTP id r3GG5TYU004097 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=OK) for ; Tue, 16 Apr 2013 12:05:29 -0400 Received: from localhost.localdomain.com ([10.34.250.241]) by int-mx10.intmail.prod.int.phx2.redhat.com (8.14.4/8.14.4) with ESMTP id r3GG5OML019439; Tue, 16 Apr 2013 12:05:27 -0400 From: Pavel Hrdina To: qemu-devel@nongnu.org Date: Tue, 16 Apr 2013 18:05:13 +0200 Message-Id: <918a1a8bde813010ce5576613614ad1d58f10942.1366127809.git.phrdina@redhat.com> In-Reply-To: References: In-Reply-To: References: X-Scanned-By: MIMEDefang 2.68 on 10.5.11.23 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 01/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 Later in the patch series we will use this function few times. This will avoid of duplicating the code. Signed-off-by: Pavel Hrdina Reviewed-by: Eric Blake --- qemu-img.c | 17 +++++++++++------ 1 file changed, 11 insertions(+), 6 deletions(-) diff --git a/qemu-img.c b/qemu-img.c index 31627b0..dbacdb7 100644 --- a/qemu-img.c +++ b/qemu-img.c @@ -322,6 +322,16 @@ static int add_old_style_options(const char *fmt, QEMUOptionParameter *list, return 0; } +static int qemu_img_handle_error(const char *msg, Error *err) +{ + if (error_is_set(&err)) { + error_report("%s: %s", msg, error_get_pretty(err)); + error_free(err); + return 1; + } + return 0; +} + static int img_create(int argc, char **argv) { int c; @@ -400,13 +410,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("qemu-img create failed", local_err); } static void dump_json_image_check(ImageCheck *check, bool quiet)