From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from [140.186.70.92] (port=41452 helo=eggs.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1Pwgm0-0001fx-3t 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 1Pwgly-0006aq-EJ for qemu-devel@nongnu.org; Mon, 07 Mar 2011 15:11:20 -0500 Received: from e1.ny.us.ibm.com ([32.97.182.141]:37154) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Pwgly-0006am-Aj for qemu-devel@nongnu.org; Mon, 07 Mar 2011 15:11:18 -0500 Received: from d01dlp02.pok.ibm.com (d01dlp02.pok.ibm.com [9.56.224.85]) by e1.ny.us.ibm.com (8.14.4/8.13.1) with ESMTP id p27K1SPS013313 for ; Mon, 7 Mar 2011 15:01:28 -0500 Received: from d01relay05.pok.ibm.com (d01relay05.pok.ibm.com [9.56.227.237]) by d01dlp02.pok.ibm.com (Postfix) with ESMTP id 8ECEC6E8041 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 d01relay05.pok.ibm.com (8.13.8/8.13.8/NCO v10.0) with ESMTP id p27KBHWQ226366 for ; Mon, 7 Mar 2011 15:11:17 -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 p27KBGZ3012919 for ; Mon, 7 Mar 2011 15:11:17 -0500 From: Michael Roth Date: Mon, 7 Mar 2011 14:10:39 -0600 Message-Id: <1299528642-23631-14-git-send-email-mdroth@linux.vnet.ibm.com> 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> Subject: [Qemu-devel] [RFC][PATCH v7 13/16] virtagent: add va_shutdown HMP/QMP command 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, markus_mueller@de.ibm.com, aliguori@linux.vnet.ibm.com, abeekhof@redhat.com Signed-off-by: Michael Roth --- hmp-commands.hx | 16 ++++++++++++++++ qmp-commands.hx | 32 ++++++++++++++++++++++++++++++++ virtagent.c | 24 ++++++++++++++++++++++++ virtagent.h | 2 ++ 4 files changed, 74 insertions(+), 0 deletions(-) diff --git a/hmp-commands.hx b/hmp-commands.hx index f22117a..982ba25 100644 --- a/hmp-commands.hx +++ b/hmp-commands.hx @@ -1396,6 +1396,22 @@ STEXI Ping the guest agent ETEXI + { + .name = "va_shutdown", + .args_type = "shutdown_mode:s", + .params = "shutdown_mode", + .help = "Start guest-initiated reboot/halt/powerdown", + .user_print = monitor_user_noop, + .mhandler.cmd_async = do_va_shutdown, + .flags = MONITOR_CMD_ASYNC, + }, + +STEXI +@item va_shutdown +@findex va_shutdown +Start guest-initiated reboot/halt/powerdown +ETEXI + STEXI @end table ETEXI diff --git a/qmp-commands.hx b/qmp-commands.hx index 0379b61..dc25021 100644 --- a/qmp-commands.hx +++ b/qmp-commands.hx @@ -923,6 +923,38 @@ Example: EQMP { + .name = "va_shutdown", + .args_type = "shutdown_mode:s", + .params = "shutdown_mode", + .help = "reboot|halt|powerdown the guest", + .user_print = monitor_user_noop, + .mhandler.cmd_async = do_va_shutdown, + .flags = MONITOR_CMD_ASYNC, + }, + +STEXI +@item va_shutdown +@findex va_shutdown +reboot|halt|powerdown the guest +ETEXI +SQMP +va_shutdown +-------- + +reboot|halt|powerdown the guest + +Arguments: + +- "shutdown_mode": "reboot"|"halt"|"powerdown" + +Example: + +-> { "execute": "va_shutdown", "arguments": { "shutdown_mode": "reboot" } } +<- { "return": {} } + +EQMP + + { .name = "qmp_capabilities", .args_type = "", .params = "", diff --git a/virtagent.c b/virtagent.c index baf3c0e..7d2566e 100644 --- a/virtagent.c +++ b/virtagent.c @@ -476,6 +476,30 @@ int do_va_ping(Monitor *mon, const QDict *params, return ret; } +static void do_va_shutdown_cb(QDict *resp, + MonitorCompletion *mon_cb, + void *mon_data) +{ + TRACE("called"); + va_check_response_ok(resp, NULL); + if (mon_cb) { + mon_cb(mon_data, NULL); + } +} + +/* + * do_va_shutdown(): shutdown/powerdown/reboot the guest + */ +int do_va_shutdown(Monitor *mon, const QDict *params, + MonitorCompletion cb, void *opaque) +{ + int ret = va_do_rpc("shutdown", params, do_va_shutdown_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 a58d8ba..08c1004 100644 --- a/virtagent.h +++ b/virtagent.h @@ -45,5 +45,7 @@ int do_va_capabilities(Monitor *mon, const QDict *mon_params, void do_va_ping_print(Monitor *mon, const QObject *qobject); int do_va_ping(Monitor *mon, const QDict *mon_params, MonitorCompletion cb, void *opaque); +int do_va_shutdown(Monitor *mon, const QDict *params, + MonitorCompletion cb, void *opaque); #endif /* VIRTAGENT_H */ -- 1.7.0.4