From patchwork Mon Dec 6 16:08:31 2010 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jes Sorensen X-Patchwork-Id: 74384 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from lists.gnu.org (lists.gnu.org [199.232.76.165]) (using TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits)) (Client did not present a certificate) by ozlabs.org (Postfix) with ESMTPS id 03C8FB70DA for ; Tue, 7 Dec 2010 03:15:09 +1100 (EST) Received: from localhost ([127.0.0.1]:36037 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1PPdiT-0008SW-Ow for incoming@patchwork.ozlabs.org; Mon, 06 Dec 2010 11:15:05 -0500 Received: from [140.186.70.92] (port=46132 helo=eggs.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1PPdcD-0005OF-JB for qemu-devel@nongnu.org; Mon, 06 Dec 2010 11:08:38 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1PPdcC-0008Eq-5X for qemu-devel@nongnu.org; Mon, 06 Dec 2010 11:08:36 -0500 Received: from mx1.redhat.com ([209.132.183.28]:7168) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1PPdcB-0008EG-Na for qemu-devel@nongnu.org; Mon, 06 Dec 2010 11:08:36 -0500 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.13.8/8.13.8) with ESMTP id oB6G8X0P022263 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=OK); Mon, 6 Dec 2010 11:08:33 -0500 Received: from red-feather.redhat.com (ovpn-113-53.phx2.redhat.com [10.3.113.53]) by int-mx10.intmail.prod.int.phx2.redhat.com (8.14.4/8.14.4) with ESMTP id oB6G8Vxf028200; Mon, 6 Dec 2010 11:08:32 -0500 From: Jes.Sorensen@redhat.com To: kwolf@redhat.com Date: Mon, 6 Dec 2010 17:08:31 +0100 Message-Id: <1291651711-11595-1-git-send-email-Jes.Sorensen@redhat.com> X-Scanned-By: MIMEDefang 2.68 on 10.5.11.23 X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. Cc: stefanha@linux.vnet.ibm.com, qemu-devel@nongnu.org Subject: [Qemu-devel] [PATCH v5 4/7] Make error handling more consistent in img_create() and img_resize() X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: qemu-devel.nongnu.org List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org From: Jes Sorensen Signed-off-by: Jes Sorensen --- qemu-img.c | 18 ++++++++++++------ 1 files changed, 12 insertions(+), 6 deletions(-) diff --git a/qemu-img.c b/qemu-img.c index aded72d..6b2b18b 100644 --- a/qemu-img.c +++ b/qemu-img.c @@ -314,13 +314,15 @@ static int img_create(int argc, char **argv) drv = bdrv_find_format(fmt); if (!drv) { error("Unknown file format '%s'", fmt); - return 1; + ret = -1; + goto out; } proto_drv = bdrv_find_protocol(filename); if (!proto_drv) { error("Unknown protocol '%s'", filename); - return 1; + ret = -1; + goto out; } create_options = append_option_parameters(create_options, @@ -1432,7 +1434,7 @@ static int img_resize(int argc, char **argv) int c, ret, relative; const char *filename, *fmt, *size; int64_t n, total_size; - BlockDriverState *bs; + BlockDriverState *bs = NULL; QEMUOptionParameter *param; QEMUOptionParameter resize_options[] = { { @@ -1483,14 +1485,16 @@ static int img_resize(int argc, char **argv) param = parse_option_parameters("", resize_options, NULL); if (set_option_parameter(param, BLOCK_OPT_SIZE, size)) { /* Error message already printed when size parsing fails */ - exit(1); + ret = -1; + goto out; } n = get_option_parameter(param, BLOCK_OPT_SIZE)->value.n; free_option_parameters(param); bs = bdrv_new_open(filename, fmt, BDRV_O_FLAGS | BDRV_O_RDWR); if (!bs) { - return 1; + ret = -1; + goto out; } if (relative) { @@ -1520,7 +1524,9 @@ static int img_resize(int argc, char **argv) break; } out: - bdrv_delete(bs); + if (bs) { + bdrv_delete(bs); + } if (ret) { return 1; }