[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
Re: [Qemu-devel] [PATCH v3 02/10] qemu-img: add support for --object com
From: |
Daniel P. Berrange |
Subject: |
Re: [Qemu-devel] [PATCH v3 02/10] qemu-img: add support for --object command line arg |
Date: |
Thu, 21 Jan 2016 16:19:19 +0000 |
User-agent: |
Mutt/1.5.24 (2015-08-30) |
On Tue, Jan 19, 2016 at 10:37:04AM +0000, Daniel P. Berrange wrote:
> Allow creation of user creatable object types with qemu-img
> 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-img info --object secret,id=sec0,file=mypasswd.txt \
> ...other info args...
>
> Signed-off-by: Daniel P. Berrange <address@hidden>
> ---
> qemu-img-cmds.hx | 44 ++++-----
> qemu-img.c | 266
> +++++++++++++++++++++++++++++++++++++++++++++++++++++--
> qemu-img.texi | 8 ++
> 3 files changed, 288 insertions(+), 30 deletions(-)
> +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;
> +}
> +
> static int GCC_FMT_ATTR(2, 3) qprintf(bool quiet, const char *fmt, ...)
> {
> int ret = 0;
> @@ -273,9 +309,17 @@ static int img_create(int argc, char **argv)
> char *options = NULL;
> Error *local_err = NULL;
> bool quiet = false;
> + QemuOpts *opts;
>
> for(;;) {
> - c = getopt(argc, argv, "F:b:f:he6o:q");
> + int option_index = 0;
> + static const struct option long_options[] = {
> + {"help", no_argument, 0, 'h'},
> + {"object", required_argument, 0, OPTION_OBJECT},
> + {0, 0, 0, 0}
> + };
> + c = getopt_long(argc, argv, "F:b:f:he6o:q",
> + long_options, &option_index);
> if (c == -1) {
> break;
> }
> @@ -317,6 +361,13 @@ static int img_create(int argc, char **argv)
> case 'q':
> quiet = true;
> break;
> + case OPTION_OBJECT:
> + opts = qemu_opts_parse_noisily(qemu_find_opts("object"),
> + optarg, true);
> + if (!opts) {
> + exit(1);
> + }
> + break;
> }
> }
>
> @@ -332,6 +383,12 @@ static int img_create(int argc, char **argv)
> }
> optind++;
>
> + if (qemu_opts_foreach(qemu_find_opts("object"),
> + object_create,
> + NULL, NULL)) {
> + exit(1);
I realize I neeed to pass '&local_err' as the last param and
add error_report_err(local_err); before exiting, to get errors
shown to the user.
Likewise for the qemu-io/qemu-nbd patches.
Regards,
Daniel
--
|: http://berrange.com -o- http://www.flickr.com/photos/dberrange/ :|
|: http://libvirt.org -o- http://virt-manager.org :|
|: http://autobuild.org -o- http://search.cpan.org/~danberr/ :|
|: http://entangle-photo.org -o- http://live.gnome.org/gtk-vnc :|
- [Qemu-devel] [PATCH v3 00/10] Make qemu-img/qemu-nbd/qemu-io CLI more flexible, Daniel P. Berrange, 2016/01/19
- [Qemu-devel] [PATCH v3 01/10] qom: add helpers for UserCreatable object types, Daniel P. Berrange, 2016/01/19
- [Qemu-devel] [PATCH v3 04/10] qemu-io: add support for --object command line arg, Daniel P. Berrange, 2016/01/19
- [Qemu-devel] [PATCH v3 03/10] qemu-nbd: add support for --object command line arg, Daniel P. Berrange, 2016/01/19
- [Qemu-devel] [PATCH v3 02/10] qemu-img: add support for --object command line arg, Daniel P. Berrange, 2016/01/19
- Re: [Qemu-devel] [PATCH v3 02/10] qemu-img: add support for --object command line arg,
Daniel P. Berrange <=
- [Qemu-devel] [PATCH v3 05/10] qemu-io: allow specifying image as a set of options args, Daniel P. Berrange, 2016/01/19
- [Qemu-devel] [PATCH v3 06/10] qemu-nbd: allow specifying image as a set of options args, Daniel P. Berrange, 2016/01/19
- [Qemu-devel] [PATCH v3 10/10] qemu-io: use no_argument/required_argument constants, Daniel P. Berrange, 2016/01/19
- [Qemu-devel] [PATCH v3 09/10] qemu-nbd: use no_argument/required_argument constants, Daniel P. Berrange, 2016/01/19
- [Qemu-devel] [PATCH v3 08/10] qemu-nbd: don't overlap long option values with short options, Daniel P. Berrange, 2016/01/19
- [Qemu-devel] [PATCH v3 07/10] qemu-img: allow specifying image as a set of options args, Daniel P. Berrange, 2016/01/19