From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from [140.186.70.92] (port=43556 helo=eggs.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1PPdG3-0005KM-KH for qemu-devel@nongnu.org; Mon, 06 Dec 2010 10:45:44 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1PPdG1-0002Py-RA for qemu-devel@nongnu.org; Mon, 06 Dec 2010 10:45:43 -0500 Received: from mx1.redhat.com ([209.132.183.28]:38574) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1PPdG1-0002PN-EB for qemu-devel@nongnu.org; Mon, 06 Dec 2010 10:45:41 -0500 From: Jes.Sorensen@redhat.com Date: Mon, 6 Dec 2010 16:45:25 +0100 Message-Id: <1291650325-10968-1-git-send-email-Jes.Sorensen@redhat.com> Subject: [Qemu-devel] [PATCH 4/7] Make error handling more consistent in img_create() and img_resize() List-Id: qemu-devel.nongnu.org List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: kwolf@redhat.com Cc: stefanha@linux.vnet.ibm.com, qemu-devel@nongnu.org From: Jes Sorensen Signed-off-by: Jes Sorensen --- qemu-img.c | 14 +++++++++----- 1 files changed, 9 insertions(+), 5 deletions(-) diff --git a/qemu-img.c b/qemu-img.c index aded72d..2deac67 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) { -- 1.7.3.2