From patchwork Wed Feb 19 15:12:53 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Kevin Wolf X-Patchwork-Id: 321941 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from lists.gnu.org (lists.gnu.org [IPv6:2001:4830:134:3::11]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id DA4DF2C00A7 for ; Thu, 20 Feb 2014 02:13:58 +1100 (EST) Received: from localhost ([::1]:59929 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1WG8qS-0000qt-K9 for incoming@patchwork.ozlabs.org; Wed, 19 Feb 2014 10:13:56 -0500 Received: from eggs.gnu.org ([2001:4830:134:3::10]:54485) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1WG8pk-0000oS-Gc for qemu-devel@nongnu.org; Wed, 19 Feb 2014 10:13:18 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1WG8pe-0002gc-Ak for qemu-devel@nongnu.org; Wed, 19 Feb 2014 10:13:12 -0500 Received: from mx1.redhat.com ([209.132.183.28]:49997) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1WG8pe-0002gN-3P for qemu-devel@nongnu.org; Wed, 19 Feb 2014 10:13:06 -0500 Received: from int-mx12.intmail.prod.int.phx2.redhat.com (int-mx12.intmail.prod.int.phx2.redhat.com [10.5.11.25]) by mx1.redhat.com (8.14.4/8.14.4) with ESMTP id s1JFD5oD016458 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=OK) for ; Wed, 19 Feb 2014 10:13:05 -0500 Received: from dhcp-200-207.str.redhat.com (dhcp-192-197.str.redhat.com [10.33.192.197]) by int-mx12.intmail.prod.int.phx2.redhat.com (8.14.4/8.14.4) with ESMTP id s1JFD0bP005275; Wed, 19 Feb 2014 10:13:03 -0500 From: Kevin Wolf To: qemu-devel@nongnu.org Date: Wed, 19 Feb 2014 16:12:53 +0100 Message-Id: <1392822778-4823-3-git-send-email-kwolf@redhat.com> In-Reply-To: <1392822778-4823-1-git-send-email-kwolf@redhat.com> References: <1392822778-4823-1-git-send-email-kwolf@redhat.com> X-Scanned-By: MIMEDefang 2.68 on 10.5.11.25 X-detected-operating-system: by eggs.gnu.org: GNU/Linux 3.x X-Received-From: 209.132.183.28 Cc: kwolf@redhat.com, stefanha@redhat.com, mreitz@redhat.com Subject: [Qemu-devel] [PATCH 2/7] qemu-img convert: Detect options specified more than once 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 Instead of ignoring all option values but the last one, error out if an option is set multiple times. Again, the only exception is a -o help option, which may be added to any valid qemu-img convert command and ignores all other options. Signed-off-by: Kevin Wolf --- qemu-img.c | 49 +++++++++++++++++++++++++++++++++++++++++++++---- 1 file changed, 45 insertions(+), 4 deletions(-) diff --git a/qemu-img.c b/qemu-img.c index 6a64fe1..55c2c75 100644 --- a/qemu-img.c +++ b/qemu-img.c @@ -1170,6 +1170,7 @@ static int img_convert(int argc, char **argv) QEMUOptionParameter *param = NULL, *create_options = NULL; QEMUOptionParameter *out_baseimg_param; char *options = NULL; + bool options_help = false; const char *snapshot_name = NULL; int min_sparse = 8; /* Need at least 4k of zeros for sparse detection */ bool quiet = false; @@ -1177,8 +1178,8 @@ static int img_convert(int argc, char **argv) QemuOpts *sn_opts = NULL; fmt = NULL; - out_fmt = "raw"; - cache = "unsafe"; + out_fmt = NULL; + cache = NULL; out_baseimg = NULL; compress = 0; skip_create = 0; @@ -1193,12 +1194,24 @@ static int img_convert(int argc, char **argv) help(); break; case 'f': + if (fmt) { + error_report("-f may only be specified once"); + return 1; + } fmt = optarg; break; case 'O': + if (out_fmt) { + error_report("-O may only be specified once"); + return 1; + } out_fmt = optarg; break; case 'B': + if (out_baseimg) { + error_report("-B may only be specified once"); + return 1; + } out_baseimg = optarg; break; case 'c': @@ -1213,12 +1226,29 @@ static int img_convert(int argc, char **argv) "compat6\' instead!"); return 1; case 'o': - options = optarg; + if (is_help_option(optarg)) { + options_help = true; + } else if (!options) { + options = optarg; + } else { + error_report("-o cannot be used multiple times. Please use a " + "single -o option with comma-separated settings " + "instead."); + return 1; + } break; case 's': + if (sn_opts || snapshot_name) { + error_report("-l/-s may only be specified once"); + return 1; + } snapshot_name = optarg; break; case 'l': + if (sn_opts || snapshot_name) { + error_report("-l/-s may only be specified once"); + return 1; + } if (strstart(optarg, SNAPSHOT_OPT_BASE, NULL)) { sn_opts = qemu_opts_parse(&internal_snapshot_opts, optarg, 0); if (!sn_opts) { @@ -1247,6 +1277,10 @@ static int img_convert(int argc, char **argv) progress = 1; break; case 't': + if (cache) { + error_report("-t may only be specified once"); + return 1; + } cache = optarg; break; case 'q': @@ -1258,6 +1292,13 @@ static int img_convert(int argc, char **argv) } } + if (!out_fmt) { + out_fmt = "raw"; + } + if (!cache) { + cache = "unsafe"; + } + if (quiet) { progress = 0; } @@ -1272,7 +1313,7 @@ static int img_convert(int argc, char **argv) /* Initialize before goto out */ qemu_progress_init(progress, 1.0); - if (options && is_help_option(options)) { + if (options_help) { ret = print_block_option_help(out_filename, out_fmt); goto out; }