[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-block] [PATCH v5 05/10] qemu-io: allow specifying image as a set o
From: |
Daniel P. Berrange |
Subject: |
[Qemu-block] [PATCH v5 05/10] qemu-io: allow specifying image as a set of options args |
Date: |
Tue, 2 Feb 2016 12:57:39 +0000 |
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 <address@hidden>
---
qemu-io.c | 31 ++++++++++++++++++++++++++++++-
1 file changed, 30 insertions(+), 1 deletion(-)
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();
--
2.5.0
- [Qemu-block] [PATCH v5 00/10] Make qemu-img/qemu-nbd/qemu-io CLI more flexible, Daniel P. Berrange, 2016/02/02
- [Qemu-block] [PATCH v5 02/10] qemu-img: add support for --object command line arg, Daniel P. Berrange, 2016/02/02
- [Qemu-block] [PATCH v5 05/10] qemu-io: allow specifying image as a set of options args,
Daniel P. Berrange <=
- [Qemu-block] [PATCH v5 03/10] qemu-nbd: add support for --object command line arg, Daniel P. Berrange, 2016/02/02
- [Qemu-block] [PATCH v5 04/10] qemu-io: add support for --object command line arg, Daniel P. Berrange, 2016/02/02
- [Qemu-block] [PATCH v5 06/10] qemu-nbd: allow specifying image as a set of options args, Daniel P. Berrange, 2016/02/02
- [Qemu-block] [PATCH v5 08/10] qemu-nbd: don't overlap long option values with short options, Daniel P. Berrange, 2016/02/02
- [Qemu-block] [PATCH v5 10/10] qemu-io: use no_argument/required_argument constants, Daniel P. Berrange, 2016/02/02