[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH v4 06/10] qemu-nbd: allow specifying image as a set
From: |
Daniel P. Berrange |
Subject: |
[Qemu-devel] [PATCH v4 06/10] qemu-nbd: allow specifying image as a set of options args |
Date: |
Tue, 26 Jan 2016 13:34:18 +0000 |
Currently qemu-nbd 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-nbd https://127.0.0.1/images/centos7.iso
qemu-nbd /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-nbd --image-opts driver=http,url=https://127.0.0.1/images,sslverify=off
qemu-nbd --image-opts file=/home/berrange/demo.qcow2
This flag is mutually exclusive with the '-f' flag.
Signed-off-by: Daniel P. Berrange <address@hidden>
---
qemu-nbd.c | 45 ++++++++++++++++++++++++++++++++++++++++-----
1 file changed, 40 insertions(+), 5 deletions(-)
diff --git a/qemu-nbd.c b/qemu-nbd.c
index 8e5d36c..764698f 100644
--- a/qemu-nbd.c
+++ b/qemu-nbd.c
@@ -48,6 +48,7 @@
#define QEMU_NBD_OPT_DISCARD 3
#define QEMU_NBD_OPT_DETECT_ZEROES 4
#define QEMU_NBD_OPT_OBJECT 5
+#define QEMU_NBD_OPT_IMAGE_OPTS 6
static NBDExport *exp;
static int verbose;
@@ -381,6 +382,16 @@ static SocketAddress *nbd_build_socket_address(const char
*sockpath,
}
+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 */ }
+ },
+};
+
static QemuOptsList qemu_object_opts = {
.name = "object",
.implied_opt_name = "qom-type",
@@ -448,6 +459,7 @@ int main(int argc, char **argv)
{ "persistent", 0, NULL, 't' },
{ "verbose", 0, NULL, 'v' },
{ "object", 1, NULL, QEMU_NBD_OPT_OBJECT },
+ { "image-opts", 0, NULL, QEMU_NBD_OPT_IMAGE_OPTS },
{ NULL, 0, NULL, 0 }
};
int ch;
@@ -466,6 +478,7 @@ int main(int argc, char **argv)
BlockdevDetectZeroesOptions detect_zeroes =
BLOCKDEV_DETECT_ZEROES_OPTIONS_OFF;
QDict *options = NULL;
QemuOpts *opts;
+ bool imageOpts = false;
/* The client thread uses SIGTERM to interrupt the server. A signal
* handler ensures that "qemu-nbd -v -c" exits with a nice status code.
@@ -635,6 +648,9 @@ int main(int argc, char **argv)
exit(1);
}
break;
+ case QEMU_NBD_OPT_IMAGE_OPTS:
+ imageOpts = true;
+ break;
case '?':
error_report("Try `%s --help' for more information.", argv[0]);
exit(EXIT_FAILURE);
@@ -744,13 +760,32 @@ int main(int argc, char **argv)
bdrv_init();
atexit(bdrv_close_all);
- if (fmt) {
- options = qdict_new();
- qdict_put(options, "driver", qstring_from_str(fmt));
+ srcpath = argv[optind];
+ if (imageOpts) {
+ char *file = NULL;
+ if (fmt) {
+ error_report("--image-opts and -f are mutually exclusive");
+ exit(EXIT_FAILURE);
+ }
+ opts = qemu_opts_parse_noisily(&file_opts, srcpath, true);
+ if (!opts) {
+ qemu_opts_reset(&file_opts);
+ exit(EXIT_FAILURE);
+ }
+ file = g_strdup(qemu_opt_get(opts, "file"));
+ qemu_opt_unset(opts, "file");
+ options = qemu_opts_to_qdict(opts, NULL);
+ qemu_opts_reset(&file_opts);
+ blk = blk_new_open("hda", file, NULL, options, flags, &local_err);
+ g_free(file);
+ } else {
+ if (fmt) {
+ options = qdict_new();
+ qdict_put(options, "driver", qstring_from_str(fmt));
+ }
+ blk = blk_new_open("hda", srcpath, NULL, options, flags, &local_err);
}
- srcpath = argv[optind];
- blk = blk_new_open("hda", srcpath, NULL, options, flags, &local_err);
if (!blk) {
error_reportf_err(local_err, "Failed to blk_new_open '%s': ",
argv[optind]);
--
2.5.0
- [Qemu-devel] [PATCH v4 00/10] Make qemu-img/qemu-nbd/qemu-io CLI more flexible, Daniel P. Berrange, 2016/01/26
- [Qemu-devel] [PATCH v4 01/10] qom: add helpers for UserCreatable object types, Daniel P. Berrange, 2016/01/26
- [Qemu-devel] [PATCH v4 03/10] qemu-nbd: add support for --object command line arg, Daniel P. Berrange, 2016/01/26
- [Qemu-devel] [PATCH v4 04/10] qemu-io: add support for --object command line arg, Daniel P. Berrange, 2016/01/26
- [Qemu-devel] [PATCH v4 06/10] qemu-nbd: allow specifying image as a set of options args,
Daniel P. Berrange <=
- [Qemu-devel] [PATCH v4 02/10] qemu-img: add support for --object command line arg, Daniel P. Berrange, 2016/01/26
- [Qemu-devel] [PATCH v4 05/10] qemu-io: allow specifying image as a set of options args, Daniel P. Berrange, 2016/01/26
- [Qemu-devel] [PATCH v4 10/10] qemu-io: use no_argument/required_argument constants, Daniel P. Berrange, 2016/01/26
- [Qemu-devel] [PATCH v4 08/10] qemu-nbd: don't overlap long option values with short options, Daniel P. Berrange, 2016/01/26
- [Qemu-devel] [PATCH v4 09/10] qemu-nbd: use no_argument/required_argument constants, Daniel P. Berrange, 2016/01/26
- [Qemu-devel] [PATCH v4 07/10] qemu-img: allow specifying image as a set of options args, Daniel P. Berrange, 2016/01/26