From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from [140.186.70.92] (port=32925 helo=eggs.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1Peowi-000737-Gn 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 1PeowY-0006HX-BF for qemu-devel@nongnu.org; Mon, 17 Jan 2011 08:16:26 -0500 Received: from e3.ny.us.ibm.com ([32.97.182.143]:59061) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1PeowY-0006HQ-8U for qemu-devel@nongnu.org; Mon, 17 Jan 2011 08:16:22 -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 p0HCvG0C021765 for ; Mon, 17 Jan 2011 07:57:24 -0500 Received: from d01relay06.pok.ibm.com (d01relay06.pok.ibm.com [9.56.227.116]) by d01dlp02.pok.ibm.com (Postfix) with ESMTP id 3DC984DE8042 for ; Mon, 17 Jan 2011 08:13:08 -0500 (EST) Received: from d01av04.pok.ibm.com (d01av04.pok.ibm.com [9.56.224.64]) by d01relay06.pok.ibm.com (8.13.8/8.13.8/NCO v10.0) with ESMTP id p0HDGKLP2363624 for ; Mon, 17 Jan 2011 08:16:20 -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 p0HDGJWt030921 for ; Mon, 17 Jan 2011 08:16:20 -0500 From: Michael Roth Date: Mon, 17 Jan 2011 07:15:07 -0600 Message-Id: <1295270117-24760-14-git-send-email-mdroth@linux.vnet.ibm.com> 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> Subject: [Qemu-devel] [RFC][PATCH v6 13/23] virtagent: add agent_shutdown 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, 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 Provide monitor command to initiate guest reboot/halt/powerdown Signed-off-by: Michael Roth --- hmp-commands.hx | 16 ++++++++++++++ qmp-commands.hx | 32 +++++++++++++++++++++++++++++ virtagent.c | 59 +++++++++++++++++++++++++++++++++++++++++++++++++++++++ virtagent.h | 2 + 4 files changed, 109 insertions(+), 0 deletions(-) diff --git a/hmp-commands.hx b/hmp-commands.hx index f60c64f..0a8c500 100644 --- a/hmp-commands.hx +++ b/hmp-commands.hx @@ -1360,6 +1360,22 @@ STEXI View guest dmesg output ETEXI + { + .name = "agent_shutdown", + .args_type = "shutdown_type:s", + .params = "[reboot|shutdown|poweroff]", + .help = "Shutdown/reboot a guest locally", + .user_print = monitor_user_noop, + .mhandler.cmd_async = do_agent_shutdown, + .flags = MONITOR_CMD_ASYNC, + }, + +STEXI +@item agent_shutdown +@findex agent_shutdown +Shutdown/reboot a guest locally +ETEXI + STEXI @end table ETEXI diff --git a/qmp-commands.hx b/qmp-commands.hx index 0db38bd..98d7270 100644 --- a/qmp-commands.hx +++ b/qmp-commands.hx @@ -863,6 +863,38 @@ Example: EQMP { + .name = "agent_shutdown", + .args_type = "shutdown_type:s", + .params = "[reboot|shutdown|poweroff]", + .help = "Shutdown/reboot the guest locally", + .user_print = monitor_user_noop, + .mhandler.cmd_async = do_agent_shutdown, + .flags = MONITOR_CMD_ASYNC, + }, + +STEXI +@item agent_shutdown +@findex agent_shutdown +Shutdown/reboot the guest locally +ETEXI +SQMP +agent_shutdown +-------- + +Shutdown the guest locally + +Arguments: + +(none) + +Example: + +-> { "execute": "agent_shutdown" } +<- { "return": {} } + +EQMP + + { .name = "qmp_capabilities", .args_type = "", .params = "", diff --git a/virtagent.c b/virtagent.c index 0976afe..27700fb 100644 --- a/virtagent.c +++ b/virtagent.c @@ -344,3 +344,62 @@ int do_agent_viewdmesg(Monitor *mon, const QDict *mon_params, xmlrpc_DECREF(params); return ret; } + +static void do_agent_shutdown_cb(const char *resp_data, + size_t resp_data_len, + MonitorCompletion *mon_cb, + void *mon_data) +{ + xmlrpc_value *resp = NULL; + xmlrpc_env env; + + TRACE("called"); + + if (resp_data == NULL) { + LOG("error handling RPC request"); + goto out_no_resp; + } + + xmlrpc_env_init(&env); + resp = xmlrpc_parse_response(&env, resp_data, resp_data_len); + if (va_rpc_has_error(&env)) { + LOG("RPC Failed (%i): %s\n", env.fault_code, + env.fault_string); + goto out_no_resp; + } + + xmlrpc_DECREF(resp); +out_no_resp: + if (mon_cb) { + mon_cb(mon_data, NULL); + } +} + +/* + * do_agent_shutdown(): Shutdown a guest + */ +int do_agent_shutdown(Monitor *mon, const QDict *mon_params, + MonitorCompletion cb, void *opaque) +{ + xmlrpc_env env; + xmlrpc_value *params; + const char *shutdown_type; + int ret; + + TRACE("called"); + + xmlrpc_env_init(&env); + shutdown_type = qdict_get_str(mon_params, "shutdown_type"); + params = xmlrpc_build_value(&env, "(s)", shutdown_type); + if (va_rpc_has_error(&env)) { + return -1; + } + + ret = va_do_rpc(&env, "va.shutdown", params, do_agent_shutdown_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 b67abc3..8281b90 100644 --- a/virtagent.h +++ b/virtagent.h @@ -36,5 +36,7 @@ int do_agent_viewfile(Monitor *mon, const QDict *mon_params, void do_agent_viewdmesg_print(Monitor *mon, const QObject *qobject); 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); #endif /* VIRTAGENT_H */ -- 1.7.0.4