From patchwork Mon Jan 17 13:15:09 2011 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Michael Roth X-Patchwork-Id: 79181 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 E7B2BB70F1 for ; Tue, 18 Jan 2011 00:56:31 +1100 (EST) Received: from localhost ([127.0.0.1]:52955 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1PepBm-0008Lu-06 for incoming@patchwork.ozlabs.org; Mon, 17 Jan 2011 08:32:06 -0500 Received: from [140.186.70.92] (port=32959 helo=eggs.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1Peowh-00075K-UT for qemu-devel@nongnu.org; Mon, 17 Jan 2011 08:16:37 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1Peowb-0006Il-4u for qemu-devel@nongnu.org; Mon, 17 Jan 2011 08:16:29 -0500 Received: from e3.ny.us.ibm.com ([32.97.182.143]:59075) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Peowb-0006Id-1d for qemu-devel@nongnu.org; Mon, 17 Jan 2011 08:16:25 -0500 Received: from d01dlp02.pok.ibm.com (d01dlp02.pok.ibm.com [9.56.224.85]) by e3.ny.us.ibm.com (8.14.4/8.13.1) with ESMTP id p0HCvG0M021765 for ; Mon, 17 Jan 2011 07:57:27 -0500 Received: from d01relay07.pok.ibm.com (d01relay07.pok.ibm.com [9.56.227.147]) by d01dlp02.pok.ibm.com (Postfix) with ESMTP id D889C4DE8042 for ; Mon, 17 Jan 2011 08:13:10 -0500 (EST) Received: from d01av04.pok.ibm.com (d01av04.pok.ibm.com [9.56.224.64]) by d01relay07.pok.ibm.com (8.13.8/8.13.8/NCO v10.0) with ESMTP id p0HDGNoo2383930 for ; Mon, 17 Jan 2011 08:16:23 -0500 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 p0HDGMPu031038 for ; Mon, 17 Jan 2011 08:16:23 -0500 Received: from localhost.localdomain (sig-9-76-0-14.mts.ibm.com [9.76.0.14]) by d01av04.pok.ibm.com (8.14.4/8.13.1/NCO v10.0 AVin) with ESMTP id p0HDFULB026421; Mon, 17 Jan 2011 08:16:21 -0500 From: Michael Roth To: qemu-devel@nongnu.org Date: Mon, 17 Jan 2011 07:15:09 -0600 Message-Id: <1295270117-24760-16-git-send-email-mdroth@linux.vnet.ibm.com> X-Mailer: git-send-email 1.7.0.4 In-Reply-To: <1295270117-24760-1-git-send-email-mdroth@linux.vnet.ibm.com> References: <1295270117-24760-1-git-send-email-mdroth@linux.vnet.ibm.com> X-Content-Scanned: Fidelis XPS MAILER X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.6, seldom 2.4 (older, 4) Cc: agl@linux.vnet.ibm.com, stefanha@linux.vnet.ibm.com, Jes.Sorensen@redhat.com, marcel.mittelstaedt@de.ibm.com, mdroth@linux.vnet.ibm.com, markus_mueller@de.ibm.com, aliguori@linux.vnet.ibm.com, ryanh@us.ibm.com, abeekhof@redhat.com Subject: [Qemu-devel] [RFC][PATCH v6 15/23] virtagent: add agent_ping qmp/hmp commands 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 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 0a8c500..6679771 100644 --- a/hmp-commands.hx +++ b/hmp-commands.hx @@ -1376,6 +1376,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 98d7270..be6f485 100644 --- a/qmp-commands.hx +++ b/qmp-commands.hx @@ -895,6 +895,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 27700fb..4b6b7d1 100644 --- a/virtagent.c +++ b/virtagent.c @@ -403,3 +403,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 8281b90..7d3a122 100644 --- a/virtagent.h +++ b/virtagent.h @@ -38,5 +38,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 */