From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from [140.186.70.92] (port=32870 helo=eggs.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1Peowc-00072Q-Li for qemu-devel@nongnu.org; Mon, 17 Jan 2011 08:16:31 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1PeowW-0006GY-3D for qemu-devel@nongnu.org; Mon, 17 Jan 2011 08:16:22 -0500 Received: from e6.ny.us.ibm.com ([32.97.182.146]:51993) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1PeowW-0006GQ-0V for qemu-devel@nongnu.org; Mon, 17 Jan 2011 08:16:20 -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 p0HD1n9w000905 for ; Mon, 17 Jan 2011 08:01:50 -0500 Received: from d01relay07.pok.ibm.com (d01relay07.pok.ibm.com [9.56.227.147]) by d01dlp01.pok.ibm.com (Postfix) with ESMTP id 4739972805F for ; Mon, 17 Jan 2011 08:16:19 -0500 (EST) Received: from d01av04.pok.ibm.com (d01av04.pok.ibm.com [9.56.224.64]) by d01relay07.pok.ibm.com (8.13.8/8.13.8/NCO v10.0) with ESMTP id p0HDGGmm2134092 for ; Mon, 17 Jan 2011 08:16:16 -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 p0HDGF5c030664 for ; Mon, 17 Jan 2011 08:16:16 -0500 From: Michael Roth Date: Mon, 17 Jan 2011 07:15:04 -0600 Message-Id: <1295270117-24760-11-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 10/23] virtagent: add va.getdmesg RPC 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 Add RPC to view guest dmesg output. Signed-off-by: Michael Roth --- virtagent-server.c | 46 ++++++++++++++++++++++++++++++++++++++++++++++ 1 files changed, 46 insertions(+), 0 deletions(-) diff --git a/virtagent-server.c b/virtagent-server.c index af4b940..f97e4b1 100644 --- a/virtagent-server.c +++ b/virtagent-server.c @@ -119,6 +119,50 @@ EXIT_CLOSE_BAD: return result; } +/* va_getdmesg(): return dmesg output + * rpc return values: + * - dmesg output as a string + */ +static xmlrpc_value *va_getdmesg(xmlrpc_env *env, + xmlrpc_value *params, + void *user_data) +{ + char *dmesg_buf = NULL, cmd[256]; + int ret; + xmlrpc_value *result = NULL; + FILE *pipe; + + SLOG("va_getdmesg()"); + + dmesg_buf = qemu_mallocz(VA_DMESG_LEN + 2048); + sprintf(cmd, "dmesg -s %d", VA_DMESG_LEN); + + pipe = popen(cmd, "r"); + if (pipe == NULL) { + LOG("popen failed: %s", strerror(errno)); + xmlrpc_faultf(env, "popen failed: %s", strerror(errno)); + goto EXIT_NOCLOSE; + } + + ret = fread(dmesg_buf, sizeof(char), VA_DMESG_LEN, pipe); + if (!ferror(pipe)) { + dmesg_buf[ret] = '\0'; + TRACE("dmesg:\n%s", dmesg_buf); + result = xmlrpc_build_value(env, "s", dmesg_buf); + } else { + LOG("fread failed"); + xmlrpc_faultf(env, "popen failed: %s", strerror(errno)); + } + + pclose(pipe); +EXIT_NOCLOSE: + if (dmesg_buf) { + qemu_free(dmesg_buf); + } + + return result; +} + typedef struct RPCFunction { xmlrpc_value *(*func)(xmlrpc_env *env, xmlrpc_value *param, void *unused); const char *func_name; @@ -127,6 +171,8 @@ typedef struct RPCFunction { static RPCFunction guest_functions[] = { { .func = va_getfile, .func_name = "va.getfile" }, + { .func = va_getdmesg, + .func_name = "va.getdmesg" }, { NULL, NULL } }; static RPCFunction host_functions[] = { -- 1.7.0.4