| Message ID | 1450782389-17326-6-git-send-email-berrange@redhat.com |
|---|---|
| State | New |
| Headers | show |
On 12/22/2015 04:06 AM, Daniel P. Berrange wrote: > 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 Well, you CAN set the options by specifying the file as: qemu-io json:{...} but that's a mouthful to type, so I don't mind adding the new syntax. > > 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 <berrange@redhat.com> > --- > qemu-io.c | 37 ++++++++++++++++++++++++++++++++++++- > 1 file changed, 36 insertions(+), 1 deletion(-) > > @@ -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) { What if I specify more than one option? Shouldn't this be >=, rather than ==? Also, the inner () are redundant. > + 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) { Pre-existing, but the inner () are redundant. > openfile(argv[optind], flags, opts); > } > command_loop(); >
On Tue, Dec 22, 2015 at 10:06:00AM -0700, Eric Blake wrote: > On 12/22/2015 04:06 AM, Daniel P. Berrange wrote: > > 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 > > Well, you CAN set the options by specifying the file as: > qemu-io json:{...} > > but that's a mouthful to type, so I don't mind adding the new syntax. Yep, but as a user, good luck finding out the syntax you have to provide for that - AFAIK its not documented in any of our user facing docs. What everyone knows is the syntax accepted by the -drive command, so I figure we should allow it everywhere. I didn't even know about the ability to use json until Kevin mentioned it to me last time I asked about this :-) Regards, Daniel
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();
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 <berrange@redhat.com> --- qemu-io.c | 37 ++++++++++++++++++++++++++++++++++++- 1 file changed, 36 insertions(+), 1 deletion(-)