[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH v6 06/10] qemu-nbd: allow specifying image as a set
From: |
Daniel P. Berrange |
Subject: |
[Qemu-devel] [PATCH v6 06/10] qemu-nbd: allow specifying image as a set of options args |
Date: |
Mon, 15 Feb 2016 14:33:37 +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=https,url=https://127.0.0.1/images,sslverify=off
qemu-nbd --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-nbd.c | 43 ++++++++++++++++++++++++++++++++++++++-----
qemu-nbd.texi | 7 ++++++-
2 files changed, 44 insertions(+), 6 deletions(-)
diff --git a/qemu-nbd.c b/qemu-nbd.c
index 130c306..fd658ba 100644
--- a/qemu-nbd.c
+++ b/qemu-nbd.c
@@ -44,6 +44,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 7
static NBDExport *exp;
static int verbose;
@@ -103,6 +104,7 @@ static void usage(const char *name)
" --aio=MODE set AIO mode (native or threads)\n"
" --discard=MODE set discard mode (ignore, unmap)\n"
" --detect-zeroes=MODE set detect-zeroes mode (off, on, unmap)\n"
+" --image-opts treat FILE as a full set of image options\n"
"\n"
"Report bugs to <address@hidden>\n"
, name, NBD_DEFAULT_PORT, "DEVICE");
@@ -377,6 +379,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",
@@ -425,6 +437,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;
@@ -442,6 +455,7 @@ int main(int argc, char **argv)
Error *local_err = NULL;
BlockdevDetectZeroesOptions detect_zeroes =
BLOCKDEV_DETECT_ZEROES_OPTIONS_OFF;
QDict *options = NULL;
+ 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.
@@ -615,6 +629,9 @@ int main(int argc, char **argv)
exit(EXIT_FAILURE);
}
} break;
+ case QEMU_NBD_OPT_IMAGE_OPTS:
+ imageOpts = true;
+ break;
}
}
@@ -721,13 +738,29 @@ 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) {
+ QemuOpts *opts;
+ 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);
+ }
+ options = qemu_opts_to_qdict(opts, NULL);
+ qemu_opts_reset(&file_opts);
+ blk = blk_new_open("hda", NULL, NULL, options, flags, &local_err);
+ } 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]);
diff --git a/qemu-nbd.texi b/qemu-nbd.texi
index a56ebc3..53d4063 100644
--- a/qemu-nbd.texi
+++ b/qemu-nbd.texi
@@ -13,7 +13,8 @@ Export a QEMU disk image using the NBD protocol.
@c man end
@c man begin OPTIONS
address@hidden is a disk image filename.
address@hidden is a disk image filename, or a set of block
+driver options if @var{--image-opts} is specified.
@var{dev} is an NBD device.
@@ -32,6 +33,10 @@ The offset into the image
The interface to bind to (default @samp{0.0.0.0})
@item -k, address@hidden
Use a unix socket with path @var{path}
address@hidden --image-opts
+Treat @var{filename} as a set of image options, instead of a plain
+filename. If this flag is specified, the @var{-f} flag should
+not be used, instead the '@code{format=}' option should be set.
@item -f, address@hidden
Force the use of the block driver for format @var{fmt} instead of
auto-detecting
--
2.5.0
- [Qemu-devel] [PATCH v6 00/10] Make qemu-img/qemu-nbd/qemu-io CLI more flexible, Daniel P. Berrange, 2016/02/15
- [Qemu-devel] [PATCH v6 02/10] qemu-io: add support for --object command line arg, Daniel P. Berrange, 2016/02/15
- [Qemu-devel] [PATCH v6 06/10] qemu-nbd: allow specifying image as a set of options args,
Daniel P. Berrange <=
- [Qemu-devel] [PATCH v6 04/10] qemu-img: add support for --object command line arg, Daniel P. Berrange, 2016/02/15
- [Qemu-devel] [PATCH v6 03/10] qemu-nbd: add support for --object command line arg, Daniel P. Berrange, 2016/02/15
- [Qemu-devel] [PATCH v6 09/10] qemu-nbd: use no_argument/required_argument constants, Daniel P. Berrange, 2016/02/15
- [Qemu-devel] [PATCH v6 01/10] qom: add helpers for UserCreatable object types, Daniel P. Berrange, 2016/02/15
- [Qemu-devel] [PATCH v6 08/10] qemu-nbd: don't overlap long option values with short options, Daniel P. Berrange, 2016/02/15
- [Qemu-devel] [PATCH v6 07/10] qemu-img: allow specifying image as a set of options args, Daniel P. Berrange, 2016/02/15
- [Qemu-devel] [PATCH v6 10/10] qemu-io: use no_argument/required_argument constants, Daniel P. Berrange, 2016/02/15
- [Qemu-devel] [PATCH v6 05/10] qemu-io: allow specifying image as a set of options args, Daniel P. Berrange, 2016/02/15
- Re: [Qemu-devel] [PATCH v6 00/10] Make qemu-img/qemu-nbd/qemu-io CLI more flexible, Kevin Wolf, 2016/02/15