[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-block] [PATCH v2 04/10] qemu-io: add support for --object command
From: |
Daniel P. Berrange |
Subject: |
[Qemu-block] [PATCH v2 04/10] qemu-io: add support for --object command line arg |
Date: |
Wed, 23 Dec 2015 17:11:16 +0000 |
Allow creation of user creatable object types with qemu-io
via a new --object command line arg. This will be used to supply
passwords and/or encryption keys to the various block driver
backends via the recently added 'secret' object type.
# printf letmein > mypasswd.txt
# qemu-io --object secret,id=sec0,file=mypasswd.txt \
...other args...
Signed-off-by: Daniel P. Berrange <address@hidden>
---
qemu-io.c | 53 +++++++++++++++++++++++++++++++++++++++++++++++++++++
1 file changed, 53 insertions(+)
diff --git a/qemu-io.c b/qemu-io.c
index 269f17c..eedab73 100644
--- a/qemu-io.c
+++ b/qemu-io.c
@@ -21,6 +21,8 @@
#include "qemu/config-file.h"
#include "qemu/readline.h"
#include "qapi/qmp/qstring.h"
+#include "qapi/opts-visitor.h"
+#include "qom/object_interfaces.h"
#include "sysemu/block-backend.h"
#include "block/block_int.h"
#include "trace/control.h"
@@ -205,6 +207,8 @@ static void usage(const char *name)
"Usage: %s [-h] [-V] [-rsnm] [-f FMT] [-c STRING] ... [file]\n"
"QEMU Disk exerciser\n"
"\n"
+" --object OBJECTDEF define an object such as 'secret' for\n"
+" passwords and/or encryption keys\n"
" -c, --cmd STRING execute command with its arguments\n"
" from the given string\n"
" -f, --format FMT specifies the block driver to use\n"
@@ -366,6 +370,38 @@ static void reenable_tty_echo(void)
qemu_set_tty_echo(STDIN_FILENO, true);
}
+enum {
+ OPTION_OBJECT = 256,
+};
+
+static QemuOptsList qemu_object_opts = {
+ .name = "object",
+ .implied_opt_name = "qom-type",
+ .head = QTAILQ_HEAD_INITIALIZER(qemu_object_opts.head),
+ .desc = {
+ { }
+ },
+};
+
+static int object_create(void *opaque, QemuOpts *opts, Error **errp)
+{
+ Error *err = NULL;
+ OptsVisitor *ov;
+ QDict *pdict;
+
+ ov = opts_visitor_new(opts);
+ pdict = qemu_opts_to_qdict(opts, NULL);
+
+ user_creatable_add(pdict, opts_get_visitor(ov), &err);
+ opts_visitor_cleanup(ov);
+ QDECREF(pdict);
+ if (err) {
+ error_propagate(errp, err);
+ return -1;
+ }
+ return 0;
+}
+
int main(int argc, char **argv)
{
int readonly = 0;
@@ -384,6 +420,7 @@ int main(int argc, char **argv)
{ "discard", 1, NULL, 'd' },
{ "cache", 1, NULL, 't' },
{ "trace", 1, NULL, 'T' },
+ { "object", 1, NULL, OPTION_OBJECT },
{ NULL, 0, NULL, 0 }
};
int c;
@@ -391,6 +428,7 @@ int main(int argc, char **argv)
int flags = BDRV_O_UNMAP;
Error *local_error = NULL;
QDict *opts = NULL;
+ QemuOpts *qopts = NULL;
#ifdef CONFIG_POSIX
signal(SIGPIPE, SIG_IGN);
@@ -399,6 +437,8 @@ int main(int argc, char **argv)
progname = basename(argv[0]);
qemu_init_exec_dir(argv[0]);
+ module_call_init(MODULE_INIT_QOM);
+ qemu_add_opts(&qemu_object_opts);
bdrv_init();
while ((c = getopt_long(argc, argv, sopt, lopt, &opt_index)) != -1) {
@@ -450,6 +490,13 @@ int main(int argc, char **argv)
case 'h':
usage(progname);
exit(0);
+ case OPTION_OBJECT:
+ qopts = qemu_opts_parse_noisily(qemu_find_opts("object"),
+ optarg, true);
+ if (!qopts) {
+ exit(1);
+ }
+ break;
default:
usage(progname);
exit(1);
@@ -466,6 +513,12 @@ int main(int argc, char **argv)
exit(1);
}
+ if (qemu_opts_foreach(qemu_find_opts("object"),
+ object_create,
+ NULL, NULL)) {
+ exit(1);
+ }
+
/* initialize commands */
qemuio_add_command(&quit_cmd);
qemuio_add_command(&open_cmd);
--
2.5.0
- [Qemu-block] [PATCH v2 00/10] Make qemu-img/qemu-nbd/qemu-io CLI more flexible, Daniel P. Berrange, 2015/12/23
- [Qemu-block] [PATCH v2 01/10] qom: add helpers for UserCreatable object types, Daniel P. Berrange, 2015/12/23
- [Qemu-block] [PATCH v2 03/10] qemu-nbd: add support for --object command line arg, Daniel P. Berrange, 2015/12/23
- [Qemu-block] [PATCH v2 04/10] qemu-io: add support for --object command line arg,
Daniel P. Berrange <=
- [Qemu-block] [PATCH v2 02/10] qemu-img: add support for --object command line arg, Daniel P. Berrange, 2015/12/23
- [Qemu-block] [PATCH v2 06/10] qemu-nbd: allow specifying image as a set of options args, Daniel P. Berrange, 2015/12/23
- [Qemu-block] [PATCH v2 05/10] qemu-io: allow specifying image as a set of options args, Daniel P. Berrange, 2015/12/23
- [Qemu-block] [PATCH v2 08/10] qemu-nbd: don't overlap long option values with short options, Daniel P. Berrange, 2015/12/23
- [Qemu-block] [PATCH v2 09/10] qemu-nbd: use no_argument/required_argument constants, Daniel P. Berrange, 2015/12/23
- [Qemu-block] [PATCH v2 07/10] qemu-img: allow specifying image as a set of options args, Daniel P. Berrange, 2015/12/23
- [Qemu-block] [PATCH v2 10/10] qemu-io: use no_argument/required_argument constants, Daniel P. Berrange, 2015/12/23