From patchwork Tue Jan 19 10:37:07 2016 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: 8060271 Return-Path: X-Original-To: patchwork-qemu-devel@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork1.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.29.136]) by patchwork1.web.kernel.org (Postfix) with ESMTP id C9A8E9F818 for ; Tue, 19 Jan 2016 10:41:22 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 03BC1203AA for ; Tue, 19 Jan 2016 10:41:22 +0000 (UTC) Received: from lists.gnu.org (lists.gnu.org [208.118.235.17]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id 14AFB2037C for ; Tue, 19 Jan 2016 10:41:21 +0000 (UTC) Received: from localhost ([::1]:36112 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1aLTiy-0005Ta-7R for patchwork-qemu-devel@patchwork.kernel.org; Tue, 19 Jan 2016 05:41:20 -0500 Received: from eggs.gnu.org ([2001:4830:134:3::10]:52062) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1aLTfN-0007sp-Lo for qemu-devel@nongnu.org; Tue, 19 Jan 2016 05:37:40 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1aLTfM-000841-NE for qemu-devel@nongnu.org; Tue, 19 Jan 2016 05:37:37 -0500 Received: from mx1.redhat.com ([209.132.183.28]:34884) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1aLTfH-00081j-95; Tue, 19 Jan 2016 05:37:31 -0500 Received: from int-mx09.intmail.prod.int.phx2.redhat.com (int-mx09.intmail.prod.int.phx2.redhat.com [10.5.11.22]) by mx1.redhat.com (Postfix) with ESMTPS id E1506A3274; Tue, 19 Jan 2016 10:37:30 +0000 (UTC) Received: from t530wlan.home.berrange.com.com (vpn1-6-80.ams2.redhat.com [10.36.6.80]) by int-mx09.intmail.prod.int.phx2.redhat.com (8.14.4/8.14.4) with ESMTP id u0JAbINt000994; Tue, 19 Jan 2016 05:37:29 -0500 From: "Daniel P. Berrange" To: qemu-devel@nongnu.org Date: Tue, 19 Jan 2016 10:37:07 +0000 Message-Id: <1453199832-22523-6-git-send-email-berrange@redhat.com> In-Reply-To: <1453199832-22523-1-git-send-email-berrange@redhat.com> References: <1453199832-22523-1-git-send-email-berrange@redhat.com> X-Scanned-By: MIMEDefang 2.68 on 10.5.11.22 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 v3 05/10] 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+patchwork-qemu-devel=patchwork.kernel.org@nongnu.org Sender: qemu-devel-bounces+patchwork-qemu-devel=patchwork.kernel.org@nongnu.org X-Spam-Status: No, score=-6.9 required=5.0 tests=BAYES_00, RCVD_IN_DNSWL_HI, UNPARSEABLE_RELAY autolearn=unavailable version=3.3.1 X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on mail.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP Currently qemu-io allows an image filename to be passed on the command line, but unless using the JSON format, it 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 --image-opts arg that indicates that the positional filename should be interpreted as a full option string, not just a filename. qemu-io --image-opts driver=http,url=https://127.0.0.1/images,sslverify=off qemu-io --image-opts file=/home/berrange/demo.qcow2 This flag is mutually exclusive with the '-f' flag. Signed-off-by: Daniel P. Berrange --- qemu-io.c | 34 +++++++++++++++++++++++++++++++++- 1 file changed, 33 insertions(+), 1 deletion(-) diff --git a/qemu-io.c b/qemu-io.c index 884a23e..dceaaa9 100644 --- a/qemu-io.c +++ b/qemu-io.c @@ -370,6 +370,7 @@ static void reenable_tty_echo(void) enum { OPTION_OBJECT = 256, + OPTION_IMAGE_OPTS = 257, }; static QemuOptsList qemu_object_opts = { @@ -400,6 +401,16 @@ static int object_create(void *opaque, QemuOpts *opts, Error **errp) 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; @@ -419,6 +430,7 @@ int main(int argc, char **argv) { "cache", 1, NULL, 't' }, { "trace", 1, NULL, 'T' }, { "object", 1, NULL, OPTION_OBJECT }, + { "image-opts", 0, NULL, OPTION_IMAGE_OPTS }, { NULL, 0, NULL, 0 } }; int c; @@ -427,6 +439,7 @@ int main(int argc, char **argv) Error *local_error = NULL; QDict *opts = NULL; QemuOpts *qopts = NULL; + bool imageOpts = false; #ifdef CONFIG_POSIX signal(SIGPIPE, SIG_IGN); @@ -495,6 +508,9 @@ int main(int argc, char **argv) exit(1); } break; + case OPTION_IMAGE_OPTS: + imageOpts = true; + break; default: usage(progname); exit(1); @@ -536,7 +552,23 @@ int main(int argc, char **argv) flags |= BDRV_O_RDWR; } - if ((argc - optind) == 1) { + if (imageOpts) { + char *file; + qopts = qemu_opts_parse_noisily(&file_opts, argv[optind], false); + if (!qopts) { + exit(1); + } + if (opts) { + error_report("--image-opts and -f 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();