From patchwork Tue Dec 22 11:06:27 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: =?utf-8?q?Daniel_P=2E_Berrang=C3=A9?= X-Patchwork-Id: 559974 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 ACF04140BA1 for ; Tue, 22 Dec 2015 22:08:38 +1100 (AEDT) Received: from localhost ([::1]:49743 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1aBKo0-0006On-FS for incoming@patchwork.ozlabs.org; Tue, 22 Dec 2015 06:08:36 -0500 Received: from eggs.gnu.org ([2001:4830:134:3::10]:45520) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1aBKmJ-0002yt-EC for qemu-devel@nongnu.org; Tue, 22 Dec 2015 06:06:52 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1aBKmI-0003Nq-9f for qemu-devel@nongnu.org; Tue, 22 Dec 2015 06:06:51 -0500 Received: from mx1.redhat.com ([209.132.183.28]:39442) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1aBKmD-0003MO-L1; Tue, 22 Dec 2015 06:06:45 -0500 Received: from int-mx13.intmail.prod.int.phx2.redhat.com (int-mx13.intmail.prod.int.phx2.redhat.com [10.5.11.26]) by mx1.redhat.com (Postfix) with ESMTPS id 58DAFC0B7E02; Tue, 22 Dec 2015 11:06:45 +0000 (UTC) Received: from t530wlan.home.berrange.com.com (vpn1-6-96.ams2.redhat.com [10.36.6.96]) by int-mx13.intmail.prod.int.phx2.redhat.com (8.14.4/8.14.4) with ESMTP id tBMB6YjI003852; Tue, 22 Dec 2015 06:06:43 -0500 From: "Daniel P. Berrange" To: qemu-devel@nongnu.org Date: Tue, 22 Dec 2015 11:06:27 +0000 Message-Id: <1450782389-17326-6-git-send-email-berrange@redhat.com> In-Reply-To: <1450782389-17326-1-git-send-email-berrange@redhat.com> References: <1450782389-17326-1-git-send-email-berrange@redhat.com> X-Scanned-By: MIMEDefang 2.68 on 10.5.11.26 X-detected-operating-system: by eggs.gnu.org: GNU/Linux 3.x X-Received-From: 209.132.183.28 Cc: Kevin Wolf , qemu-block@nongnu.org, Markus Armbruster , Paolo Bonzini , =?UTF-8?q?Andreas=20F=C3=A4rber?= Subject: [Qemu-devel] [PATCH 5/7] qemu-io: allow specifying image as a set of options args 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 Currently qemu-io allows an image filename to be passed on the command line, but does not have a way to set any options except the format eg qemu-io https://127.0.0.1/images/centos7.iso qemu-io /home/berrange/demo.qcow2 This adds a --source arg (that is mutually exclusive with a positional filename arg and -f arg) that accepts a full option string, as well as the original syntax eg qemu-io --source driver=http,url=https://127.0.0.1/images,sslverify=off qemu-io --source https://127.0.0.1/images/centos7.iso qemu-io --source file=/home/berrange/demo.qcow2 qemu-io --source /home/berrange/demo.qcow2 Signed-off-by: Daniel P. Berrange --- qemu-io.c | 37 ++++++++++++++++++++++++++++++++++++- 1 file changed, 36 insertions(+), 1 deletion(-) diff --git a/qemu-io.c b/qemu-io.c index cf1dac6..fc7f81b 100644 --- a/qemu-io.c +++ b/qemu-io.c @@ -373,6 +373,7 @@ static void reenable_tty_echo(void) enum { OPTION_OBJECT = 258, + OPTION_SOURCE = 259, }; static QemuOptsList qemu_object_opts = { @@ -436,6 +437,16 @@ out: return 0; } +static QemuOptsList file_opts = { + .name = "file", + .implied_opt_name = "file", + .head = QTAILQ_HEAD_INITIALIZER(file_opts.head), + .desc = { + /* no elements => accept any params */ + { /* end of list */ } + }, +}; + int main(int argc, char **argv) { int readonly = 0; @@ -455,6 +466,7 @@ int main(int argc, char **argv) { "cache", 1, NULL, 't' }, { "trace", 1, NULL, 'T' }, { "object", 1, NULL, OPTION_OBJECT }, + { "source", 1, NULL, OPTION_SOURCE }, { NULL, 0, NULL, 0 } }; int c; @@ -531,6 +543,12 @@ int main(int argc, char **argv) exit(1); } break; + case OPTION_SOURCE: + if (!qemu_opts_parse_noisily(&file_opts, optarg, false)) { + qemu_opts_reset(&file_opts); + return 0; + } + break; default: usage(progname); exit(1); @@ -572,7 +590,24 @@ int main(int argc, char **argv) flags |= BDRV_O_RDWR; } - if ((argc - optind) == 1) { + qopts = qemu_opts_find(&file_opts, NULL); + if (qopts) { + char *file; + if (opts) { + error_report("--source and -f are mutually exclusive"); + exit(1); + } + if ((argc - optind) == 1) { + error_report("--source and filename are mutually exclusive"); + exit(1); + } + file = g_strdup(qemu_opt_get(qopts, "file")); + qemu_opt_unset(qopts, "file"); + opts = qemu_opts_to_qdict(qopts, NULL); + qemu_opts_reset(&file_opts); + openfile(file, flags, opts); + g_free(file); + } else if ((argc - optind) == 1) { openfile(argv[optind], flags, opts); } command_loop();