| Message ID | 1454417864-18774-6-git-send-email-berrange@redhat.com (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
On 02/02/2016 05:57 AM, Daniel P. Berrange wrote: > 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=https,url=https://127.0.0.1/images,sslverify=off > qemu-io --image-opts driver=file,filename=/home/berrange/demo.qcow2 > > This flag is mutually exclusive with the '-f' flag. I guess it's easier to enforce the mutual exclusion, than it is to try and figure out how to make -f work with the --image-opts filename as long as the two aren't specifying conflicting formats. Seems okay as long as it is documented well. > > Signed-off-by: Daniel P. Berrange <berrange@redhat.com> > --- > qemu-io.c | 31 ++++++++++++++++++++++++++++++- > 1 file changed, 30 insertions(+), 1 deletion(-) > > @@ -515,7 +531,20 @@ int main(int argc, char **argv) > flags |= BDRV_O_RDWR; > } > > - if ((argc - optind) == 1) { > + if (imageOpts) { > + QemuOpts *qopts; > + qopts = qemu_opts_parse_noisily(&file_opts, argv[optind], false); Ouch. If argc == optind (possible if I type 'qemu-io --image-opts' without a filename), then argv[optind] == NULL, and you end up calling strncmp(NULL, "id=", 3) inside opts_parse(). Also, I noticed that running 'qemu-io' without arguments puts you into a shell mode, where you can then open files after the fact via the open_f() callback function (the 'open' command) - either that function should that function be given --image-opts support, or use of --image-opts from the command line should globally affect all subsequent use of open_f().
On Wed, Feb 03, 2016 at 08:37:15AM -0700, Eric Blake wrote: > On 02/02/2016 05:57 AM, Daniel P. Berrange wrote: > > 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=https,url=https://127.0.0.1/images,sslverify=off > > qemu-io --image-opts driver=file,filename=/home/berrange/demo.qcow2 > > > > This flag is mutually exclusive with the '-f' flag. > > I guess it's easier to enforce the mutual exclusion, than it is to try > and figure out how to make -f work with the --image-opts filename as > long as the two aren't specifying conflicting formats. Seems okay as > long as it is documented well. > > > > > Signed-off-by: Daniel P. Berrange <berrange@redhat.com> > > --- > > qemu-io.c | 31 ++++++++++++++++++++++++++++++- > > 1 file changed, 30 insertions(+), 1 deletion(-) > > > > > @@ -515,7 +531,20 @@ int main(int argc, char **argv) > > flags |= BDRV_O_RDWR; > > } > > > > - if ((argc - optind) == 1) { > > + if (imageOpts) { > > + QemuOpts *qopts; > > + qopts = qemu_opts_parse_noisily(&file_opts, argv[optind], false); > > Ouch. If argc == optind (possible if I type 'qemu-io --image-opts' > without a filename), then argv[optind] == NULL, and you end up calling > strncmp(NULL, "id=", 3) inside opts_parse(). Yeah, I should not have removed the ((argc - optind) ==1) check here - it should be the first thing checked, and imageOpts the second. > Also, I noticed that running 'qemu-io' without arguments puts you into a > shell mode, where you can then open files after the fact via the > open_f() callback function (the 'open' command) - either that function > should that function be given --image-opts support, or use of > --image-opts from the command line should globally affect all subsequent > use of open_f(). That function already has a --option / -o argument that has a similar result, but I agree that if --image-opts is given on the cli we should probably use that exclusively. Regards, Daniel
diff --git a/qemu-io.c b/qemu-io.c index 65a28e4..3544fd7 100644 --- a/qemu-io.c +++ b/qemu-io.c @@ -366,6 +366,7 @@ static void reenable_tty_echo(void) enum { OPTION_OBJECT = 256, + OPTION_IMAGE_OPTS = 257, }; static QemuOptsList qemu_object_opts = { @@ -378,6 +379,16 @@ static QemuOptsList qemu_object_opts = { }; +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; @@ -397,6 +408,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; @@ -404,6 +416,7 @@ int main(int argc, char **argv) int flags = BDRV_O_UNMAP; Error *local_error = NULL; QDict *opts = NULL; + bool imageOpts = false; #ifdef CONFIG_POSIX signal(SIGPIPE, SIG_IGN); @@ -473,6 +486,9 @@ int main(int argc, char **argv) exit(1); } } break; + case OPTION_IMAGE_OPTS: + imageOpts = true; + break; default: usage(progname); exit(1); @@ -515,7 +531,20 @@ int main(int argc, char **argv) flags |= BDRV_O_RDWR; } - if ((argc - optind) == 1) { + if (imageOpts) { + QemuOpts *qopts; + 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); + } + opts = qemu_opts_to_qdict(qopts, NULL); + qemu_opts_reset(&file_opts); + openfile(NULL, flags, opts); + } 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 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=https,url=https://127.0.0.1/images,sslverify=off qemu-io --image-opts driver=file,filename=/home/berrange/demo.qcow2 This flag is mutually exclusive with the '-f' flag. Signed-off-by: Daniel P. Berrange <berrange@redhat.com> --- qemu-io.c | 31 ++++++++++++++++++++++++++++++- 1 file changed, 30 insertions(+), 1 deletion(-)