From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from [140.186.70.92] (port=44612 helo=eggs.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1POZzN-00026Z-SG for qemu-devel@nongnu.org; Fri, 03 Dec 2010 13:04:13 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1POZzM-0003GW-7K for qemu-devel@nongnu.org; Fri, 03 Dec 2010 13:04:09 -0500 Received: from e8.ny.us.ibm.com ([32.97.182.138]:60416) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1POZzM-0003GQ-3b for qemu-devel@nongnu.org; Fri, 03 Dec 2010 13:04:08 -0500 Received: from d01dlp02.pok.ibm.com (d01dlp02.pok.ibm.com [9.56.224.85]) by e8.ny.us.ibm.com (8.14.4/8.13.1) with ESMTP id oB3HkU4m024296 for ; Fri, 3 Dec 2010 12:46:30 -0500 Received: from d01relay05.pok.ibm.com (d01relay05.pok.ibm.com [9.56.227.237]) by d01dlp02.pok.ibm.com (Postfix) with ESMTP id C8D334DE803E for ; Fri, 3 Dec 2010 13:02:24 -0500 (EST) Received: from d01av01.pok.ibm.com (d01av01.pok.ibm.com [9.56.224.215]) by d01relay05.pok.ibm.com (8.13.8/8.13.8/NCO v10.0) with ESMTP id oB3I47hJ147686 for ; Fri, 3 Dec 2010 13:04:07 -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 oB3I45FT014416 for ; Fri, 3 Dec 2010 13:04:06 -0500 From: Michael Roth Date: Fri, 3 Dec 2010 12:03:15 -0600 Message-Id: <1291399402-20366-15-git-send-email-mdroth@linux.vnet.ibm.com> In-Reply-To: <1291399402-20366-1-git-send-email-mdroth@linux.vnet.ibm.com> References: <1291399402-20366-1-git-send-email-mdroth@linux.vnet.ibm.com> Subject: [Qemu-devel] [RFC][PATCH v5 14/21] virtagent: add agent_ping qmp/hmp commands List-Id: qemu-devel.nongnu.org List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Cc: agl@linux.vnet.ibm.com, stefanha@linux.vnet.ibm.com, Jes.Sorensen@redhat.com, mdroth@linux.vnet.ibm.com, aliguori@linux.vnet.ibm.com, ryanh@us.ibm.com, abeekhof@redhat.com Monitor command to ping the RPC server. Signed-off-by: Michael Roth --- hmp-commands.hx | 16 ++++++++++++ qmp-commands.hx | 32 +++++++++++++++++++++++ virtagent.c | 74 +++++++++++++++++++++++++++++++++++++++++++++++++++++++ virtagent.h | 3 ++ 4 files changed, 125 insertions(+), 0 deletions(-) diff --git a/hmp-commands.hx b/hmp-commands.hx index 3250e41..d3f642f 100644 --- a/hmp-commands.hx +++ b/hmp-commands.hx @@ -1260,6 +1260,22 @@ STEXI Shutdown/reboot a guest locally ETEXI + { + .name = "agent_ping", + .args_type = "", + .params = "", + .help = "Ping a guest", + .user_print = do_agent_ping_print, + .mhandler.cmd_async = do_agent_ping, + .flags = MONITOR_CMD_ASYNC, + }, + +STEXI +@item agent_ping +@findex agent_ping +Ping a guest +ETEXI + STEXI @end table ETEXI diff --git a/qmp-commands.hx b/qmp-commands.hx index 0f983cc..1e798f5 100644 --- a/qmp-commands.hx +++ b/qmp-commands.hx @@ -838,6 +838,38 @@ Example: EQMP { + .name = "agent_ping", + .args_type = "", + .params = "", + .help = "Ping a guest", + .user_print = do_agent_ping_print, + .mhandler.cmd_async = do_agent_ping, + .flags = MONITOR_CMD_ASYNC, + }, + +STEXI +@item agent_ping +@findex agent_ping +Ping a guest +ETEXI +SQMP +agent_ping +-------- + +Ping a guest + +Arguments: + +(none) + +Example: + +-> { "execute": "agent_ping" } +<- { "return": { "response":"ok" } } + +EQMP + + { .name = "qmp_capabilities", .args_type = "", .params = "", diff --git a/virtagent.c b/virtagent.c index 1f66787..93329e3 100644 --- a/virtagent.c +++ b/virtagent.c @@ -386,3 +386,77 @@ int do_agent_shutdown(Monitor *mon, const QDict *mon_params, xmlrpc_DECREF(params); return ret; } + +void do_agent_ping_print(Monitor *mon, const QObject *data) +{ + QDict *qdict; + const char *response; + + TRACE("called"); + + qdict = qobject_to_qdict(data); + response = qdict_get_str(qdict, "response"); + if (qdict_haskey(qdict, "response")) { + monitor_printf(mon, "%s", response); + } + + monitor_printf(mon, "\n"); +} + +static void do_agent_ping_cb(const char *resp_data, + size_t resp_data_len, + MonitorCompletion *mon_cb, + void *mon_data) +{ + xmlrpc_value *resp = NULL; + xmlrpc_env env; + QDict *qdict = qdict_new(); + + TRACE("called"); + + if (resp_data == NULL) { + LOG("error handling RPC request"); + qdict_put(qdict, "response", qstring_from_str("error")); + goto out_no_resp; + } + + xmlrpc_env_init(&env); + resp = xmlrpc_parse_response(&env, resp_data, resp_data_len); + if (va_rpc_has_error(&env)) { + qdict_put(qdict, "response", qstring_from_str("error")); + goto out_no_resp; + } + qdict_put(qdict, "response", qstring_from_str("ok")); + + xmlrpc_DECREF(resp); +out_no_resp: + if (mon_cb) { + mon_cb(mon_data, QOBJECT(qdict)); + } + qobject_decref(QOBJECT(qdict)); +} + +/* + * do_agent_ping(): Ping a guest + */ +int do_agent_ping(Monitor *mon, const QDict *mon_params, + MonitorCompletion cb, void *opaque) +{ + xmlrpc_env env; + xmlrpc_value *params; + int ret; + + xmlrpc_env_init(&env); + + params = xmlrpc_build_value(&env, "(n)"); + if (va_rpc_has_error(&env)) { + return -1; + } + + ret = va_do_rpc(&env, "va.ping", params, do_agent_ping_cb, cb, opaque); + if (ret) { + qerror_report(QERR_VA_FAILED, ret, strerror(ret)); + } + xmlrpc_DECREF(params); + return ret; +} diff --git a/virtagent.h b/virtagent.h index 60af1d8..f420c8b 100644 --- a/virtagent.h +++ b/virtagent.h @@ -36,5 +36,8 @@ int do_agent_viewdmesg(Monitor *mon, const QDict *mon_params, MonitorCompletion cb, void *opaque); int do_agent_shutdown(Monitor *mon, const QDict *mon_params, MonitorCompletion cb, void *opaque); +void do_agent_ping_print(Monitor *mon, const QObject *qobject); +int do_agent_ping(Monitor *mon, const QDict *mon_params, + MonitorCompletion cb, void *opaque); #endif /* VIRTAGENT_H */ -- 1.7.0.4