From patchwork Tue Nov 16 16:01:55 2010 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Michael Roth X-Patchwork-Id: 71425 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from lists.gnu.org (lists.gnu.org [199.232.76.165]) (using TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits)) (Client did not present a certificate) by ozlabs.org (Postfix) with ESMTPS id 0225EB7129 for ; Wed, 17 Nov 2010 03:25:05 +1100 (EST) Received: from localhost ([127.0.0.1]:34874 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1PIOJE-00087P-Mc for incoming@patchwork.ozlabs.org; Tue, 16 Nov 2010 11:23:04 -0500 Received: from [140.186.70.92] (port=34960 helo=eggs.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1PINzd-0006F4-0T for qemu-devel@nongnu.org; Tue, 16 Nov 2010 11:02:53 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1PINzW-0005Dj-5j for qemu-devel@nongnu.org; Tue, 16 Nov 2010 11:02:47 -0500 Received: from e4.ny.us.ibm.com ([32.97.182.144]:35957) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1PINzW-0005DV-2n for qemu-devel@nongnu.org; Tue, 16 Nov 2010 11:02:42 -0500 Received: from d01relay01.pok.ibm.com (d01relay01.pok.ibm.com [9.56.227.233]) by e4.ny.us.ibm.com (8.14.4/8.13.1) with ESMTP id oAGFk180014516 for ; Tue, 16 Nov 2010 10:46:01 -0500 Received: from d01av01.pok.ibm.com (d01av01.pok.ibm.com [9.56.224.215]) by d01relay01.pok.ibm.com (8.13.8/8.13.8/NCO v10.0) with ESMTP id oAGG2fo9299030 for ; Tue, 16 Nov 2010 11:02:41 -0500 Received: from d01av01.pok.ibm.com (loopback [127.0.0.1]) by d01av01.pok.ibm.com (8.14.4/8.13.1/NCO v10.0 AVout) with ESMTP id oAGG2eNs014458 for ; Tue, 16 Nov 2010 11:02:41 -0500 Received: from localhost.localdomain (sig-9-76-106-234.mts.ibm.com [9.76.106.234]) by d01av01.pok.ibm.com (8.14.4/8.13.1/NCO v10.0 AVin) with ESMTP id oAGG24rj011388; Tue, 16 Nov 2010 11:02:39 -0500 From: Michael Roth To: qemu-devel@nongnu.org Date: Tue, 16 Nov 2010 10:01:55 -0600 Message-Id: <1289923320-5638-14-git-send-email-mdroth@linux.vnet.ibm.com> X-Mailer: git-send-email 1.7.0.4 In-Reply-To: <1289923320-5638-1-git-send-email-mdroth@linux.vnet.ibm.com> References: <1289923320-5638-1-git-send-email-mdroth@linux.vnet.ibm.com> X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.6, seldom 2.4 (older, 4) Cc: aliguori@linux.vnet.ibm.com, ryanh@us.ibm.com, agl@linux.vnet.ibm.com, mdroth@linux.vnet.ibm.com, abeekhof@redhat.com Subject: [Qemu-devel] [RFC][PATCH v4 13/18] virtagent: add agent_capabilities monitor function X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: qemu-devel.nongnu.org List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Call guest agent's built-in introspection functions to get a list of supported RPCs, and re-negotiate guest agent capabilities to determine what agent_* commands are supported. Signed-off-by: Michael Roth --- hmp-commands.hx | 16 ++++++++ qmp-commands.hx | 32 ++++++++++++++++ virtagent.c | 107 +++++++++++++++++++++++++++++++++++++++++++++++++++++++ virtagent.h | 3 ++ 4 files changed, 158 insertions(+), 0 deletions(-) diff --git a/hmp-commands.hx b/hmp-commands.hx index d3f642f..d68c1ba 100644 --- a/hmp-commands.hx +++ b/hmp-commands.hx @@ -1276,6 +1276,22 @@ STEXI Ping a guest ETEXI + { + .name = "agent_capabilities", + .args_type = "", + .params = "", + .help = "Fetch and re-negotiate guest agent capabilities", + .user_print = do_agent_capabilities_print, + .mhandler.cmd_async = do_agent_capabilities, + .flags = MONITOR_CMD_ASYNC, + }, + +STEXI +@item agent_capabilities +@findex agent_capabilities +Fetch and re-negotiate guest agent capabilties +ETEXI + STEXI @end table ETEXI diff --git a/qmp-commands.hx b/qmp-commands.hx index 1e798f5..4ae0890 100644 --- a/qmp-commands.hx +++ b/qmp-commands.hx @@ -870,6 +870,38 @@ Example: EQMP { + .name = "agent_capabilities", + .args_type = "", + .params = "", + .help = "Fetch and re-negotiate guest agent capabilities", + .user_print = do_agent_capabilities_print, + .mhandler.cmd_async = do_agent_capabilities, + .flags = MONITOR_CMD_ASYNC, + }, + +STEXI +@item agent_capabilities +@findex agent_capabilities +Fetch and re-negotiate guest agent capabilties +ETEXI +SQMP +agent_capabilities +-------- + +Fetch and re-negotiate guest agent capabilities + +Arguments: + +(none) + +Example: + +-> { "execute": "agent_capabilities" } +<- { "return":["va.shutdown", "va.getdmesg", "va.getfile", ... ] } + +EQMP + + { .name = "qmp_capabilities", .args_type = "", .params = "", diff --git a/virtagent.c b/virtagent.c index 9071131..e0f7f99 100644 --- a/virtagent.c +++ b/virtagent.c @@ -587,3 +587,110 @@ int do_agent_ping(Monitor *mon, const QDict *mon_params, return 0; } + +static void va_print_capability_iter(QObject *obj, void *opaque) +{ + Monitor *mon = opaque; + QString *method = qobject_to_qstring(obj); + const char *method_str; + + if (method) { + method_str = qstring_get_str(method); + monitor_printf(mon, "%s\n", method_str); + } +} + +void do_agent_capabilities_print(Monitor *mon, const QObject *data) +{ + QList *qlist; + + TRACE("called"); + + monitor_printf(mon, "the following RPC methods are supported by the guest agent:\n"); + qlist = qobject_to_qlist(data); + qlist_iter(qlist, va_print_capability_iter, mon); +} + +static void do_agent_capabilities_cb(void *opaque) +{ + VARPCData *rpc_data = opaque; + xmlrpc_value *resp = NULL; + xmlrpc_value *cur_val = NULL; + const char *cur_method = NULL; + xmlrpc_env env; + QList *qlist = qlist_new(); + int i; + + TRACE("called"); + + if (rpc_data->status != VA_RPC_STATUS_OK) { + LOG("error handling RPC request"); + goto out_no_resp; + } + + TRACE("resp = %s\n", rpc_data->resp_xml); + + xmlrpc_env_init(&env); + resp = xmlrpc_parse_response(&env, rpc_data->resp_xml, + rpc_data->resp_xml_len); + if (rpc_has_error(&env)) { + goto out_no_resp; + } + + /* extract the list of supported RPCs */ + for (i = 0; i < xmlrpc_array_size(&env, resp); i++) { + xmlrpc_array_read_item(&env, resp, i, &cur_val); + xmlrpc_read_string(&env, cur_val, &cur_method); + if (cur_method) { + TRACE("cur_method: %s", cur_method); + qlist_append_obj(qlist, QOBJECT(qstring_from_str(cur_method))); + } + xmlrpc_DECREF(cur_val); + } + + /* set our client capabilities accordingly */ + va_set_capabilities(qlist); + + xmlrpc_DECREF(resp); +out_no_resp: + if (rpc_data->mon_cb) { + rpc_data->mon_cb(rpc_data->mon_data, QOBJECT(qlist)); + } + qobject_decref(QOBJECT(qlist)); +} + +/* + * do_agent_capabilities(): Fetch/re-negotiate guest agent capabilities + */ +int do_agent_capabilities(Monitor *mon, const QDict *mon_params, + MonitorCompletion cb, void *opaque) +{ + xmlrpc_env env; + xmlrpc_value *params; + VARPCData *rpc_data; + int ret; + + xmlrpc_env_init(&env); + + params = xmlrpc_build_value(&env, "()"); + if (rpc_has_error(&env)) { + return -1; + } + + rpc_data = qemu_mallocz(sizeof(VARPCData)); + rpc_data->cb = do_agent_capabilities_cb; + rpc_data->mon_cb = cb; + rpc_data->mon_data = opaque; + + ret = rpc_execute(&env, "system.listMethods", params, rpc_data); + if (ret == -EREMOTE) { + monitor_printf(mon, "RPC Failed (%i): %s\n", env.fault_code, + env.fault_string); + return -1; + } else if (ret == -1) { + monitor_printf(mon, "RPC communication error\n"); + return -1; + } + + return 0; +} diff --git a/virtagent.h b/virtagent.h index 071530c..c10ee35 100644 --- a/virtagent.h +++ b/virtagent.h @@ -34,5 +34,8 @@ int do_agent_shutdown(Monitor *mon, const QDict *mon_params, void do_agent_ping_print(Monitor *mon, const QObject *qobject); int do_agent_ping(Monitor *mon, const QDict *mon_params, MonitorCompletion cb, void *opaque); +void do_agent_capabilities_print(Monitor *mon, const QObject *qobject); +int do_agent_capabilities(Monitor *mon, const QDict *mon_params, + MonitorCompletion cb, void *opaque); #endif /* VIRTAGENT_H */