From patchwork Tue Nov 16 16:01:50 2010 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Michael Roth X-Patchwork-Id: 71419 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 9C77FB7129 for ; Wed, 17 Nov 2010 03:16:03 +1100 (EST) Received: from localhost ([127.0.0.1]:54383 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1PIOCO-00044A-C4 for incoming@patchwork.ozlabs.org; Tue, 16 Nov 2010 11:16:00 -0500 Received: from [140.186.70.92] (port=34960 helo=eggs.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1PINzT-0006F4-F3 for qemu-devel@nongnu.org; Tue, 16 Nov 2010 11:02:48 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1PINzP-00059O-W2 for qemu-devel@nongnu.org; Tue, 16 Nov 2010 11:02:38 -0500 Received: from e6.ny.us.ibm.com ([32.97.182.146]:39321) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1PINzP-00058w-TQ for qemu-devel@nongnu.org; Tue, 16 Nov 2010 11:02:35 -0500 Received: from d01relay03.pok.ibm.com (d01relay03.pok.ibm.com [9.56.227.235]) by e6.ny.us.ibm.com (8.14.4/8.13.1) with ESMTP id oAGG3Z43028666 for ; Tue, 16 Nov 2010 11:03:35 -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 oAGG2YHr189840 for ; Tue, 16 Nov 2010 11:02:34 -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 oAGG2Y01014130 for ; Tue, 16 Nov 2010 11:02:34 -0500 Received: from localhost.localdomain (sig-9-76-106-234.mts.ibm.com [9.76.106.234]) by d01av01.pok.ibm.com (8.14.4/8.13.1/NCO v10.0 AVin) with ESMTP id oAGG24re011388; Tue, 16 Nov 2010 11:02:32 -0500 From: Michael Roth To: qemu-devel@nongnu.org Date: Tue, 16 Nov 2010 10:01:50 -0600 Message-Id: <1289923320-5638-9-git-send-email-mdroth@linux.vnet.ibm.com> X-Mailer: git-send-email 1.7.0.4 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> X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.6, seldom 2.4 (older, 4) Cc: aliguori@linux.vnet.ibm.com, ryanh@us.ibm.com, agl@linux.vnet.ibm.com, mdroth@linux.vnet.ibm.com, abeekhof@redhat.com Subject: [Qemu-devel] [RFC][PATCH v4 08/18] virtagent: add agent_viewdmesg 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 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 | 100 +++++++++++++++++++++++++++++++++++++++++++++++++++++++ virtagent.h | 3 ++ 4 files changed, 154 insertions(+), 0 deletions(-) diff --git a/hmp-commands.hx b/hmp-commands.hx index 423c752..5b9db62 100644 --- a/hmp-commands.hx +++ b/hmp-commands.hx @@ -1228,6 +1228,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 efa2137..dc319b7 100644 --- a/qmp-commands.hx +++ b/qmp-commands.hx @@ -771,6 +771,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 3fe0a7b..e0298b9 100644 --- a/virtagent.c +++ b/virtagent.c @@ -299,6 +299,7 @@ out: xmlrpc_DECREF(resp); out_no_resp: rpc_data->mon_cb(rpc_data->mon_data, QOBJECT(qdict)); + qobject_decref(QOBJECT(qdict)); } /* @@ -337,3 +338,102 @@ int do_agent_viewfile(Monitor *mon, const QDict *mon_params, return 0; } + +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(void *opaque) +{ + VARPCData *rpc_data = opaque; + xmlrpc_value *resp = NULL; + char *dmesg = NULL; + int ret; + xmlrpc_env env; + QDict *qdict = qdict_new(); + + 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)) { + ret = -1; + goto out_no_resp; + } + + xmlrpc_parse_value(&env, resp, "s", &dmesg); + if (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: + rpc_data->mon_cb(rpc_data->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; + VARPCData *rpc_data; + int ret; + + xmlrpc_env_init(&env); + + params = xmlrpc_build_value(&env, "(n)"); + if (rpc_has_error(&env)) { + return -1; + } + + rpc_data = qemu_mallocz(sizeof(VARPCData)); + rpc_data->cb = do_agent_viewdmesg_cb; + rpc_data->mon_cb = cb; + rpc_data->mon_data = opaque; + + ret = rpc_execute(&env, "getdmesg", 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 63d77c2..c077582 100644 --- a/virtagent.h +++ b/virtagent.h @@ -26,5 +26,8 @@ int va_client_init(VPDriver *vp_drv, bool is_host); 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 */