From patchwork Mon Mar 7 20:10:37 2011 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Michael Roth X-Patchwork-Id: 85802 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 7F6FEB70F7 for ; Tue, 8 Mar 2011 07:21:24 +1100 (EST) Received: from localhost ([127.0.0.1]:37260 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1PwgsF-0004UI-Pl for incoming@patchwork.ozlabs.org; Mon, 07 Mar 2011 15:17:47 -0500 Received: from [140.186.70.92] (port=41426 helo=eggs.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1Pwgly-0001f2-W4 for qemu-devel@nongnu.org; Mon, 07 Mar 2011 15:11:21 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1Pwglx-0006ZL-PI for qemu-devel@nongnu.org; Mon, 07 Mar 2011 15:11:18 -0500 Received: from e5.ny.us.ibm.com ([32.97.182.145]:59405) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Pwglx-0006YX-ML for qemu-devel@nongnu.org; Mon, 07 Mar 2011 15:11:17 -0500 Received: from d01dlp02.pok.ibm.com (d01dlp02.pok.ibm.com [9.56.224.85]) by e5.ny.us.ibm.com (8.14.4/8.13.1) with ESMTP id p27JkSUh025260 for ; Mon, 7 Mar 2011 14:46:28 -0500 Received: from d01relay06.pok.ibm.com (d01relay06.pok.ibm.com [9.56.227.116]) by d01dlp02.pok.ibm.com (Postfix) with ESMTP id 4168A6E8041 for ; Mon, 7 Mar 2011 15:11:17 -0500 (EST) Received: from d01av01.pok.ibm.com (d01av01.pok.ibm.com [9.56.224.215]) by d01relay06.pok.ibm.com (8.13.8/8.13.8/NCO v10.0) with ESMTP id p27KBF8A2412662 for ; Mon, 7 Mar 2011 15:11:15 -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 p27KBDEJ012747 for ; Mon, 7 Mar 2011 15:11:15 -0500 Received: from localhost.localdomain (sig-9-76-30-5.mts.ibm.com [9.76.30.5]) by d01av01.pok.ibm.com (8.14.4/8.13.1/NCO v10.0 AVin) with ESMTP id p27KAi8L010005; Mon, 7 Mar 2011 15:11:12 -0500 From: Michael Roth To: qemu-devel@nongnu.org Date: Mon, 7 Mar 2011 14:10:37 -0600 Message-Id: <1299528642-23631-12-git-send-email-mdroth@linux.vnet.ibm.com> X-Mailer: git-send-email 1.7.0.4 In-Reply-To: <1299528642-23631-1-git-send-email-mdroth@linux.vnet.ibm.com> References: <1299528642-23631-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) X-Received-From: 32.97.182.145 Cc: agl@linux.vnet.ibm.com, stefanha@linux.vnet.ibm.com, Jes.Sorensen@redhat.com, mdroth@linux.vnet.ibm.com, markus_mueller@de.ibm.com, aliguori@linux.vnet.ibm.com, abeekhof@redhat.com Subject: [Qemu-devel] [RFC][PATCH v7 11/16] virtagent: add va_ping HMP/QMP command 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 Signed-off-by: Michael Roth --- hmp-commands.hx | 16 ++++++++++++++++ qmp-commands.hx | 32 ++++++++++++++++++++++++++++++++ virtagent.c | 45 +++++++++++++++++++++++++++++++++++++++++++++ virtagent.h | 3 +++ 4 files changed, 96 insertions(+), 0 deletions(-) diff --git a/hmp-commands.hx b/hmp-commands.hx index 86817e2..f22117a 100644 --- a/hmp-commands.hx +++ b/hmp-commands.hx @@ -1380,6 +1380,22 @@ STEXI Fetch and re-negotiate guest agent capabilties ETEXI + { + .name = "va_ping", + .args_type = "", + .params = "", + .help = "Ping the guest agent", + .user_print = do_va_ping_print, + .mhandler.cmd_async = do_va_ping, + .flags = MONITOR_CMD_ASYNC, + }, + +STEXI +@item va_ping +@findex va_ping +Ping the guest agent +ETEXI + STEXI @end table ETEXI diff --git a/qmp-commands.hx b/qmp-commands.hx index e1092dd..0379b61 100644 --- a/qmp-commands.hx +++ b/qmp-commands.hx @@ -891,6 +891,38 @@ Example: EQMP { + .name = "va_ping", + .args_type = "", + .params = "", + .help = "Ping the guest agent", + .user_print = monitor_user_noop, + .mhandler.cmd_async = do_va_ping, + .flags = MONITOR_CMD_ASYNC, + }, + +STEXI +@item va_ping +@findex va_ping +Ping the guest agent +ETEXI +SQMP +va_ping +-------- + +Ping the guest agent + +Arguments: + +(none) + +Example: + +-> { "execute": "va_ping" } +<- { "return": {"status": "ok" }} + +EQMP + + { .name = "qmp_capabilities", .args_type = "", .params = "", diff --git a/virtagent.c b/virtagent.c index 670309b..baf3c0e 100644 --- a/virtagent.c +++ b/virtagent.c @@ -431,6 +431,51 @@ int do_va_capabilities(Monitor *mon, const QDict *params, return ret; } +void do_va_ping_print(Monitor *mon, const QObject *data) +{ + QDict *ret = qobject_to_qdict(data); + + TRACE("called"); + + if (!data) { + return; + } + monitor_printf(mon, "status: %s\n", qdict_get_str(ret, "status")); +} + +static void do_va_ping_cb(QDict *resp, + MonitorCompletion *mon_cb, + void *mon_data) +{ + QDict *ret = qdict_new(); + const char *status; + + if (va_check_response_ok(resp, NULL)) { + status = "success"; + } else { + status = "error or timeout"; + } + qdict_put_obj(ret, "status", QOBJECT(qstring_from_str(status))); + + if (mon_cb) { + mon_cb(mon_data, QOBJECT(ret)); + } + QDECREF(ret); +} + +/* + * do_va_ping(): Ping the guest agent + */ +int do_va_ping(Monitor *mon, const QDict *params, + MonitorCompletion cb, void *opaque) +{ + int ret = va_do_rpc("ping", params, do_va_ping_cb, cb, opaque); + if (ret) { + qerror_report(QERR_VA_FAILED, ret, strerror(-ret)); + } + return ret; +} + /* RPC client functions called outside of HMP/QMP */ int va_client_init_capabilities(void) diff --git a/virtagent.h b/virtagent.h index 1652fdc..a58d8ba 100644 --- a/virtagent.h +++ b/virtagent.h @@ -42,5 +42,8 @@ int do_agent_shutdown(Monitor *mon, const QDict *mon_params, void do_va_capabilities_print(Monitor *mon, const QObject *qobject); int do_va_capabilities(Monitor *mon, const QDict *mon_params, MonitorCompletion cb, void *opaque); +void do_va_ping_print(Monitor *mon, const QObject *qobject); +int do_va_ping(Monitor *mon, const QDict *mon_params, + MonitorCompletion cb, void *opaque); #endif /* VIRTAGENT_H */