From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from [140.186.70.92] (port=35051 helo=eggs.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1PINzg-0006Hv-HK for qemu-devel@nongnu.org; Tue, 16 Nov 2010 11:02:55 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1PINzR-0005BS-VB for qemu-devel@nongnu.org; Tue, 16 Nov 2010 11:02:42 -0500 Received: from e2.ny.us.ibm.com ([32.97.182.142]:38270) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1PINzR-0005BA-Iu for qemu-devel@nongnu.org; Tue, 16 Nov 2010 11:02:37 -0500 Received: from d01relay03.pok.ibm.com (d01relay03.pok.ibm.com [9.56.227.235]) by e2.ny.us.ibm.com (8.14.4/8.13.1) with ESMTP id oAGFkSOS010084 for ; Tue, 16 Nov 2010 10:46:28 -0500 Received: from d01av01.pok.ibm.com (d01av01.pok.ibm.com [9.56.224.215]) by d01relay03.pok.ibm.com (8.13.8/8.13.8/NCO v10.0) with ESMTP id oAGG2aLg232064 for ; Tue, 16 Nov 2010 11:02:36 -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 oAGG2a3a014239 for ; Tue, 16 Nov 2010 11:02:36 -0500 From: Michael Roth Date: Tue, 16 Nov 2010 10:01:52 -0600 Message-Id: <1289923320-5638-11-git-send-email-mdroth@linux.vnet.ibm.com> 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> Subject: [Qemu-devel] [RFC][PATCH v4 10/18] virtagent: add agent_shutdown monitor command List-Id: qemu-devel.nongnu.org List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Cc: aliguori@linux.vnet.ibm.com, ryanh@us.ibm.com, agl@linux.vnet.ibm.com, mdroth@linux.vnet.ibm.com, abeekhof@redhat.com Provide monitor command to initiate guest shutdown/reboot/powerdown Signed-off-by: Michael Roth --- hmp-commands.hx | 16 +++++++++++++ qmp-commands.hx | 32 ++++++++++++++++++++++++++ virtagent.c | 66 +++++++++++++++++++++++++++++++++++++++++++++++++++++++ virtagent.h | 2 + 4 files changed, 116 insertions(+), 0 deletions(-) diff --git a/hmp-commands.hx b/hmp-commands.hx index 5b9db62..3250e41 100644 --- a/hmp-commands.hx +++ b/hmp-commands.hx @@ -1244,6 +1244,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 dc319b7..0f983cc 100644 --- a/qmp-commands.hx +++ b/qmp-commands.hx @@ -806,6 +806,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 e0298b9..a56aeac 100644 --- a/virtagent.c +++ b/virtagent.c @@ -437,3 +437,69 @@ int do_agent_viewdmesg(Monitor *mon, const QDict *mon_params, return 0; } + +static void do_agent_shutdown_cb(void *opaque) +{ + VARPCData *rpc_data = opaque; + xmlrpc_value *resp = NULL; + xmlrpc_env env; + + TRACE("called"); + + if (rpc_data->status != VA_RPC_STATUS_OK) { + LOG("error handling RPC request"); + goto out_no_resp; + } + + xmlrpc_env_init(&env); + resp = xmlrpc_parse_response(&env, rpc_data->resp_xml, + rpc_data->resp_xml_len); + if (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: + rpc_data->mon_cb(rpc_data->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; + VARPCData *rpc_data; + 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 (rpc_has_error(&env)) { + return -1; + } + + rpc_data = qemu_mallocz(sizeof(VARPCData)); + rpc_data->cb = do_agent_shutdown_cb; + rpc_data->mon_cb = cb; + rpc_data->mon_data = opaque; + + ret = rpc_execute(&env, "va_shutdown", 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 c077582..96c6260 100644 --- a/virtagent.h +++ b/virtagent.h @@ -29,5 +29,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