From patchwork Mon Jan 17 13:15:05 2011 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Michael Roth X-Patchwork-Id: 79159 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 C5B99B70CD for ; Tue, 18 Jan 2011 00:20:38 +1100 (EST) Received: from localhost ([127.0.0.1]:53260 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1Pep0U-0000JE-BS for incoming@patchwork.ozlabs.org; Mon, 17 Jan 2011 08:20:26 -0500 Received: from [140.186.70.92] (port=32830 helo=eggs.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1PeowX-0006z0-8O for qemu-devel@nongnu.org; Mon, 17 Jan 2011 08:16:27 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1PeowU-0006GF-Rz for qemu-devel@nongnu.org; Mon, 17 Jan 2011 08:16:19 -0500 Received: from e6.ny.us.ibm.com ([32.97.182.146]:51982) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1PeowU-0006G8-PW for qemu-devel@nongnu.org; Mon, 17 Jan 2011 08:16:18 -0500 Received: from d01dlp01.pok.ibm.com (d01dlp01.pok.ibm.com [9.56.224.56]) by e6.ny.us.ibm.com (8.14.4/8.13.1) with ESMTP id p0HD1cRx000681 for ; Mon, 17 Jan 2011 08:01:49 -0500 Received: from d01relay01.pok.ibm.com (d01relay01.pok.ibm.com [9.56.227.233]) by d01dlp01.pok.ibm.com (Postfix) with ESMTP id F253872805B for ; Mon, 17 Jan 2011 08:16:17 -0500 (EST) Received: from d01av04.pok.ibm.com (d01av04.pok.ibm.com [9.56.224.64]) by d01relay01.pok.ibm.com (8.13.8/8.13.8/NCO v10.0) with ESMTP id p0HDGHEv384540 for ; Mon, 17 Jan 2011 08:16:17 -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 p0HDGGuw030719 for ; Mon, 17 Jan 2011 08:16:17 -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 p0HDFUL7026421; Mon, 17 Jan 2011 08:16:15 -0500 From: Michael Roth To: qemu-devel@nongnu.org Date: Mon, 17 Jan 2011 07:15:05 -0600 Message-Id: <1295270117-24760-12-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 11/23] virtagent: add agent_viewdmesg 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 Add commands to view guest dmesg output. Currently it is a 16K buffer. Signed-off-by: Michael Roth --- hmp-commands.hx | 16 +++++++++ qmp-commands.hx | 35 +++++++++++++++++++++ virtagent.c | 92 +++++++++++++++++++++++++++++++++++++++++++++++++++++++ virtagent.h | 3 ++ 4 files changed, 146 insertions(+), 0 deletions(-) diff --git a/hmp-commands.hx b/hmp-commands.hx index a3e5e27..f60c64f 100644 --- a/hmp-commands.hx +++ b/hmp-commands.hx @@ -1344,6 +1344,22 @@ STEXI Echo the file identified by @var{filepath} on the guest filesystem ETEXI + { + .name = "agent_viewdmesg", + .args_type = "", + .params = "", + .help = "View guest dmesg output", + .user_print = do_agent_viewdmesg_print, + .mhandler.cmd_async = do_agent_viewdmesg, + .flags = MONITOR_CMD_ASYNC, + }, + +STEXI +@item agent_viewdmesg +@findex agent_viewdmesg +View guest dmesg output +ETEXI + STEXI @end table ETEXI diff --git a/qmp-commands.hx b/qmp-commands.hx index 9dca7b9..0db38bd 100644 --- a/qmp-commands.hx +++ b/qmp-commands.hx @@ -828,6 +828,41 @@ Example: EQMP { + .name = "agent_viewdmesg", + .args_type = "", + .params = "", + .help = "View guest dmesg output", + .user_print = do_agent_viewdmesg_print, + .mhandler.cmd_async = do_agent_viewdmesg, + .flags = MONITOR_CMD_ASYNC, + }, + +STEXI +@item agent_viewdmesg +@findex agent_viewdmesg +View guest dmesg output +ETEXI +SQMP +agent_viewdmesg +-------- + +View guest dmesg output + +Arguments: + +(none) + +Example: + +-> { "execute": "agent_viewdmesg" } +<- { "return": { + "contents": "[353487.942215] usb 1-4: USB disconnect, address 9\n..." + } + } + +EQMP + + { .name = "qmp_capabilities", .args_type = "", .params = "", diff --git a/virtagent.c b/virtagent.c index cd5caf1..0976afe 100644 --- a/virtagent.c +++ b/virtagent.c @@ -252,3 +252,95 @@ int do_agent_viewfile(Monitor *mon, const QDict *mon_params, xmlrpc_DECREF(params); return ret; } + +void do_agent_viewdmesg_print(Monitor *mon, const QObject *data) +{ + QDict *qdict; + const char *contents = NULL; + int i; + + qdict = qobject_to_qdict(data); + if (!qdict_haskey(qdict, "contents")) { + goto out; + } + + contents = qdict_get_str(qdict, "contents"); + if (contents != NULL) { + /* monitor_printf truncates so do it in chunks. also, file_contents + * may not be null-termed at proper location so explicitly calc + * last chunk sizes */ + for (i = 0; i < strlen(contents); i += 1024) { + monitor_printf(mon, "%.1024s", contents + i); + } + } + +out: + monitor_printf(mon, "\n"); +} + +static void do_agent_viewdmesg_cb(const char *resp_data, + size_t resp_data_len, + MonitorCompletion *mon_cb, + void *mon_data) +{ + xmlrpc_value *resp = NULL; + char *dmesg = NULL; + int ret; + xmlrpc_env env; + QDict *qdict = qdict_new(); + + 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)) { + ret = -1; + goto out_no_resp; + } + + xmlrpc_parse_value(&env, resp, "s", &dmesg); + if (va_rpc_has_error(&env)) { + ret = -1; + goto out; + } + + if (dmesg != NULL) { + qdict_put(qdict, "contents", qstring_from_str(dmesg)); + } + +out: + xmlrpc_DECREF(resp); +out_no_resp: + if (mon_cb) { + mon_cb(mon_data, QOBJECT(qdict)); + } +} + +/* + * do_agent_viewdmesg(): View guest dmesg output + */ +int do_agent_viewdmesg(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, "()"); + if (va_rpc_has_error(&env)) { + return -1; + } + + ret = va_do_rpc(&env, "va.getdmesg", params, do_agent_viewdmesg_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 1bd7595..b67abc3 100644 --- a/virtagent.h +++ b/virtagent.h @@ -33,5 +33,8 @@ int va_client_close(void); void do_agent_viewfile_print(Monitor *mon, const QObject *qobject); int do_agent_viewfile(Monitor *mon, const QDict *mon_params, MonitorCompletion cb, void *opaque); +void do_agent_viewdmesg_print(Monitor *mon, const QObject *qobject); +int do_agent_viewdmesg(Monitor *mon, const QDict *mon_params, + MonitorCompletion cb, void *opaque); #endif /* VIRTAGENT_H */