From patchwork Tue Jan 26 13:34:16 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: =?utf-8?q?Daniel_P=2E_Berrang=C3=A9?= X-Patchwork-Id: 8122041 Return-Path: X-Original-To: patchwork-qemu-devel@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork2.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.29.136]) by patchwork2.web.kernel.org (Postfix) with ESMTP id EB862BEEE5 for ; Tue, 26 Jan 2016 13:36:50 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 42A1620253 for ; Tue, 26 Jan 2016 13:36:50 +0000 (UTC) Received: from lists.gnu.org (lists.gnu.org [208.118.235.17]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id 75F6B2012D for ; Tue, 26 Jan 2016 13:36:49 +0000 (UTC) Received: from localhost ([::1]:43819 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1aO3nc-0007tW-QJ for patchwork-qemu-devel@patchwork.kernel.org; Tue, 26 Jan 2016 08:36:48 -0500 Received: from eggs.gnu.org ([2001:4830:134:3::10]:54876) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1aO3lf-0003yn-8R for qemu-devel@nongnu.org; Tue, 26 Jan 2016 08:34:48 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1aO3le-0000zS-AX for qemu-devel@nongnu.org; Tue, 26 Jan 2016 08:34:47 -0500 Received: from mx1.redhat.com ([209.132.183.28]:37404) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1aO3la-0000yf-LO; Tue, 26 Jan 2016 08:34:42 -0500 Received: from int-mx14.intmail.prod.int.phx2.redhat.com (int-mx14.intmail.prod.int.phx2.redhat.com [10.5.11.27]) by mx1.redhat.com (Postfix) with ESMTPS id 48B84C0ED3E2; Tue, 26 Jan 2016 13:34:42 +0000 (UTC) Received: from t530wlan.home.berrange.com.com (vpn1-4-241.ams2.redhat.com [10.36.4.241]) by int-mx14.intmail.prod.int.phx2.redhat.com (8.14.4/8.14.4) with ESMTP id u0QDYTra004585; Tue, 26 Jan 2016 08:34:40 -0500 From: "Daniel P. Berrange" To: qemu-devel@nongnu.org Date: Tue, 26 Jan 2016 13:34:16 +0000 Message-Id: <1453815262-13440-5-git-send-email-berrange@redhat.com> In-Reply-To: <1453815262-13440-1-git-send-email-berrange@redhat.com> References: <1453815262-13440-1-git-send-email-berrange@redhat.com> X-Scanned-By: MIMEDefang 2.68 on 10.5.11.27 X-detected-operating-system: by eggs.gnu.org: GNU/Linux 3.x X-Received-From: 209.132.183.28 Cc: Kevin Wolf , qemu-block@nongnu.org, Markus Armbruster , Paolo Bonzini , =?UTF-8?q?Andreas=20F=C3=A4rber?= Subject: [Qemu-devel] [PATCH v4 04/10] qemu-io: add support for --object command line arg X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+patchwork-qemu-devel=patchwork.kernel.org@nongnu.org Sender: qemu-devel-bounces+patchwork-qemu-devel=patchwork.kernel.org@nongnu.org X-Spam-Status: No, score=-6.9 required=5.0 tests=BAYES_00, RCVD_IN_DNSWL_HI, UNPARSEABLE_RELAY autolearn=unavailable version=3.3.1 X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on mail.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP 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 --- qemu-io.c | 54 ++++++++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 54 insertions(+) diff --git a/qemu-io.c b/qemu-io.c index d593f19..d1432ea 100644 --- a/qemu-io.c +++ b/qemu-io.c @@ -18,6 +18,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" @@ -200,6 +202,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" @@ -361,6 +365,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; @@ -379,6 +415,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; @@ -386,6 +423,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); @@ -394,6 +432,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) { @@ -445,6 +485,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); @@ -461,6 +508,13 @@ int main(int argc, char **argv) exit(1); } + if (qemu_opts_foreach(qemu_find_opts("object"), + object_create, + NULL, &local_error)) { + error_report_err(local_error); + exit(1); + } + /* initialize commands */ qemuio_add_command(&quit_cmd); qemuio_add_command(&open_cmd);