From mboxrd@z Thu Jan 1 00:00:00 1970 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 From: "Daniel P. Berrange" 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> Subject: [Qemu-devel] [PATCH v3 05/10] qemu-io: allow specifying image as a set of options args List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Cc: Kevin Wolf , qemu-block@nongnu.org, Markus Armbruster , Paolo Bonzini , =?UTF-8?q?Andreas=20F=C3=A4rber?= 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(); -- 2.5.0