From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([140.186.70.92]:42347) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1QlAEF-0003rI-Mf for qemu-devel@nongnu.org; Sun, 24 Jul 2011 21:45:10 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1QlAEC-0005U2-VP for qemu-devel@nongnu.org; Sun, 24 Jul 2011 21:45:07 -0400 Received: from e9.ny.us.ibm.com ([32.97.182.139]:53001) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1QlAEC-0005Th-Pl for qemu-devel@nongnu.org; Sun, 24 Jul 2011 21:45:04 -0400 Received: from d01relay02.pok.ibm.com (d01relay02.pok.ibm.com [9.56.227.234]) by e9.ny.us.ibm.com (8.14.4/8.13.1) with ESMTP id p6P1CbXA024298 for ; Sun, 24 Jul 2011 21:12:37 -0400 Received: from d01av04.pok.ibm.com (d01av04.pok.ibm.com [9.56.224.64]) by d01relay02.pok.ibm.com (8.13.8/8.13.8/NCO v10.0) with ESMTP id p6P1j3Ze308486 for ; Sun, 24 Jul 2011 21:45:03 -0400 Received: from d01av04.pok.ibm.com (loopback [127.0.0.1]) by d01av04.pok.ibm.com (8.14.4/8.13.1/NCO v10.0 AVout) with ESMTP id p6P1j3bo007637 for ; Sun, 24 Jul 2011 21:45:03 -0400 From: Anthony Liguori Date: Sun, 24 Jul 2011 20:44:40 -0500 Message-Id: <1311558293-5855-9-git-send-email-aliguori@us.ibm.com> In-Reply-To: <1311558293-5855-1-git-send-email-aliguori@us.ibm.com> References: <1311558293-5855-1-git-send-email-aliguori@us.ibm.com> Subject: [Qemu-devel] [PATCH 08/21] qom: add plug_create QMP command List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Cc: Anthony Liguori Signed-off-by: Anthony Liguori --- monitor.c | 49 +++++++++++++++++++++++++++++++++++++++++++++++++ qmp-commands.hx | 27 +++++++++++++++++++++++++++ 2 files changed, 76 insertions(+), 0 deletions(-) diff --git a/monitor.c b/monitor.c index 718935b..8406b5b 100644 --- a/monitor.c +++ b/monitor.c @@ -62,6 +62,12 @@ #endif #include "ui/qemu-spice.h" +#include "qemu/plug.h" +#include "qapi/qmp-input-visitor.h" +#include "qapi/qmp-output-visitor.h" + +#include + //#define DEBUG //#define DEBUG_COMPLETION @@ -1020,6 +1026,49 @@ static int do_quit(Monitor *mon, const QDict *qdict, QObject **ret_data) return 0; } +static GSList *global_plug_list; + +static int do_plug_create(Monitor *mon, const QDict *qdict, QObject **ret_data) +{ + const char *id = qdict_get_str(qdict, "id"); + const char *type = qdict_get_str(qdict, "type"); + QmpInputVisitor *qiv; + Visitor *v; + const QDictEntry *e; + TypeInstance *inst; + Plug *plug; + + inst = type_new(type, id); + if (inst == NULL) { + return -1; + } + + plug = PLUG(inst); + + global_plug_list = g_slist_prepend(global_plug_list, plug); + + qiv = qmp_input_visitor_new((QObject *)QOBJECT(qdict)); + v = qmp_input_get_visitor(qiv); + + for (e = qdict_first(qdict); e; e = qdict_next(qdict, e)) { + Error *local_err = NULL; + + if (strcmp(e->key, "id") == 0 || strcmp(e->key, "type") == 0) { + continue; + } + + plug_set_property(plug, e->key, v, &local_err); + if (local_err) { + error_free(local_err); + return -1; + } + } + + qmp_input_visitor_cleanup(qiv); + + return 0; +} + #ifdef CONFIG_VNC static int change_vnc_password(const char *password) { diff --git a/qmp-commands.hx b/qmp-commands.hx index 54e313c..c86d396 100644 --- a/qmp-commands.hx +++ b/qmp-commands.hx @@ -85,6 +85,33 @@ Example: EQMP { + .name = "plug_create", + .args_type = "device:O", + .params = "type=value,id=value[,prop=value][,...]", + .help = "create a plug", + .user_print = monitor_user_noop, + .mhandler.cmd_new = do_plug_create, + }, + +SQMP +plug_create +----------- + +Create a plug. + +Arguments: + +- type: typename of object (json-string) +- id: name of object (json-string) +- object properties + +Notes: + + (1) id MUST not contain the sequence "::" + +EQMP + + { .name = "eject", .args_type = "force:-f,device:B", .params = "[-f] device", -- 1.7.4.1