From patchwork Thu Dec 9 12:13:34 2010 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jes Sorensen X-Patchwork-Id: 74933 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 32673B70B8 for ; Fri, 10 Dec 2010 03:32:37 +1100 (EST) Received: from localhost ([127.0.0.1]:52441 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1PQjQ1-00028Y-Tb for incoming@patchwork.ozlabs.org; Thu, 09 Dec 2010 11:32:34 -0500 Received: from [140.186.70.92] (port=40499 helo=eggs.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1PQfO5-0004ce-Uw for qemu-devel@nongnu.org; Thu, 09 Dec 2010 07:14:34 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1PQfNl-0006Vy-Fn for qemu-devel@nongnu.org; Thu, 09 Dec 2010 07:14:16 -0500 Received: from mx1.redhat.com ([209.132.183.28]:7935) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1PQfNl-0006V4-61 for qemu-devel@nongnu.org; Thu, 09 Dec 2010 07:13:57 -0500 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.13.8/8.13.8) with ESMTP id oB9CDdCd014444 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=OK); Thu, 9 Dec 2010 07:13:39 -0500 Received: from red-feather.redhat.com (ovpn-113-53.phx2.redhat.com [10.3.113.53]) by int-mx02.intmail.prod.int.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id oB9CDZtG026611; Thu, 9 Dec 2010 07:13:38 -0500 From: Jes.Sorensen@redhat.com To: kwolf@redhat.com Date: Thu, 9 Dec 2010 13:13:34 +0100 Message-Id: <1291896814-3554-3-git-send-email-Jes.Sorensen@redhat.com> In-Reply-To: <1291896814-3554-1-git-send-email-Jes.Sorensen@redhat.com> References: <1291896814-3554-1-git-send-email-Jes.Sorensen@redhat.com> X-Scanned-By: MIMEDefang 2.67 on 10.5.11.12 X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. Cc: qemu-devel@nongnu.org, armbru@redhat.com, stefanha@linux.vnet.ibm.com Subject: [Qemu-devel] [PATCH 2/2] qemu-img.c: Clean up handling of image size in img_create() 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 This cleans up the handling of image size in img_create() by parsing the value early, and then only setting it once if a value has been added as the last argument to the command line. Signed-off-by: Jes Sorensen --- qemu-img.c | 23 +++++++++++++++++------ 1 files changed, 17 insertions(+), 6 deletions(-) diff --git a/qemu-img.c b/qemu-img.c index d146d8c..f078718 100644 --- a/qemu-img.c +++ b/qemu-img.c @@ -282,6 +282,7 @@ static int add_old_style_options(const char *fmt, QEMUOptionParameter *list, static int img_create(int argc, char **argv) { int c, ret = 0; + uint64_t img_size = -1; const char *fmt = "raw"; const char *base_fmt = NULL; const char *filename; @@ -329,6 +330,20 @@ static int img_create(int argc, char **argv) } filename = argv[optind++]; + /* Get image size, if specified */ + if (optind < argc) { + ssize_t sval; + sval = strtosz_suffix(argv[optind++], NULL, STRTOSZ_DEFSUFFIX_B); + if (sval < 0) { + error("Invalid image size specified! You may use k, M, G or " + "T suffixes for "); + error("kilobytes, megabytes, gigabytes and terabytes."); + ret = -1; + goto out; + } + img_size = (uint64_t)sval; + } + if (options && !strcmp(options, "?")) { ret = print_block_option_help(filename, fmt); goto out; @@ -356,7 +371,8 @@ static int img_create(int argc, char **argv) /* Create parameter list with default values */ param = parse_option_parameters("", create_options, param); - set_option_parameter_int(param, BLOCK_OPT_SIZE, -1); + + set_option_parameter_int(param, BLOCK_OPT_SIZE, img_size); /* Parse -o options */ if (options) { @@ -368,11 +384,6 @@ static int img_create(int argc, char **argv) } } - /* Add size to parameters */ - if (optind < argc) { - set_option_parameter(param, BLOCK_OPT_SIZE, argv[optind++]); - } - /* Add old-style options to parameters */ ret = add_old_style_options(fmt, param, base_filename, base_fmt); if (ret < 0) {