From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from [140.186.70.92] (port=34890 helo=eggs.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1PINzQ-0006Cr-2a for qemu-devel@nongnu.org; Tue, 16 Nov 2010 11:02:45 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1PINzO-00058K-2y for qemu-devel@nongnu.org; Tue, 16 Nov 2010 11:02:35 -0500 Received: from e3.ny.us.ibm.com ([32.97.182.143]:52444) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1PINzN-00058B-Vc for qemu-devel@nongnu.org; Tue, 16 Nov 2010 11:02:34 -0500 Received: from d01relay05.pok.ibm.com (d01relay05.pok.ibm.com [9.56.227.237]) by e3.ny.us.ibm.com (8.14.4/8.13.1) with ESMTP id oAGFj5ll030811 for ; Tue, 16 Nov 2010 10:45:05 -0500 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 oAGG2XnL068208 for ; Tue, 16 Nov 2010 11:02:33 -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 oAGG2WhM014082 for ; Tue, 16 Nov 2010 11:02:32 -0500 From: Michael Roth Date: Tue, 16 Nov 2010 10:01:49 -0600 Message-Id: <1289923320-5638-8-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 07/18] virtagent: add getdmesg RPC 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 Add RPC to view guest dmesg output. Signed-off-by: Michael Roth --- virtagent-daemon.c | 46 ++++++++++++++++++++++++++++++++++++++++++++++ virtagent-daemon.h | 1 + 2 files changed, 47 insertions(+), 0 deletions(-) diff --git a/virtagent-daemon.c b/virtagent-daemon.c index 44c0754..0dd72c0 100644 --- a/virtagent-daemon.c +++ b/virtagent-daemon.c @@ -81,6 +81,50 @@ EXIT_CLOSE_BAD: return result; } +/* getdmesg(): return dmesg output + * rpc return values: + * - dmesg output as a string + */ +static xmlrpc_value *getdmesg(xmlrpc_env *env, + xmlrpc_value *param, + void *user_data) +{ + char *dmesg_buf = NULL, cmd[256]; + int ret; + xmlrpc_value *result = NULL; + FILE *pipe; + + SLOG("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; +} + static int va_accept(int listen_fd) { struct sockaddr_in saddr; struct sockaddr *addr; @@ -110,6 +154,8 @@ typedef struct RPCFunction { static RPCFunction guest_functions[] = { { .func = getfile, .func_name = "getfile" }, + { .func = getdmesg, + .func_name = "getdmesg" }, { NULL, NULL } }; static RPCFunction host_functions[] = { diff --git a/virtagent-daemon.h b/virtagent-daemon.h index 6c3436a..09b0097 100644 --- a/virtagent-daemon.h +++ b/virtagent-daemon.h @@ -18,5 +18,6 @@ #define HOST_AGENT_PATH "/tmp/virtagent-host.sock" #define VA_GETFILE_MAX 1 << 30 #define VA_FILEBUF_LEN 16384 +#define VA_DMESG_LEN 16384 int va_server_init(VPDriver *vp_drv, bool is_host); -- 1.7.0.4