From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from [140.186.70.92] (port=48668 helo=eggs.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1PPjCY-0006wA-0c for qemu-devel@nongnu.org; Mon, 06 Dec 2010 17:06:31 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1PPjCV-0004hN-CI for qemu-devel@nongnu.org; Mon, 06 Dec 2010 17:06:29 -0500 Received: from e2.ny.us.ibm.com ([32.97.182.142]:46054) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1PPjCV-0004hD-8R for qemu-devel@nongnu.org; Mon, 06 Dec 2010 17:06:27 -0500 Received: from d01dlp02.pok.ibm.com (d01dlp02.pok.ibm.com [9.56.224.85]) by e2.ny.us.ibm.com (8.14.4/8.13.1) with ESMTP id oB6Lnqpd017030 for ; Mon, 6 Dec 2010 16:49:52 -0500 Received: from d01relay03.pok.ibm.com (d01relay03.pok.ibm.com [9.56.227.235]) by d01dlp02.pok.ibm.com (Postfix) with ESMTP id 1A0944DE803F for ; Mon, 6 Dec 2010 17:04:37 -0500 (EST) Received: from d01av04.pok.ibm.com (d01av04.pok.ibm.com [9.56.224.64]) by d01relay03.pok.ibm.com (8.13.8/8.13.8/NCO v10.0) with ESMTP id oB6M6PKo310332 for ; Mon, 6 Dec 2010 17:06:25 -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 oB6M6PLY027592 for ; Mon, 6 Dec 2010 17:06:25 -0500 From: Adam Litke In-Reply-To: <1291399402-20366-8-git-send-email-mdroth@linux.vnet.ibm.com> References: <1291399402-20366-1-git-send-email-mdroth@linux.vnet.ibm.com> <1291399402-20366-8-git-send-email-mdroth@linux.vnet.ibm.com> Content-Type: text/plain; charset="UTF-8" Date: Mon, 06 Dec 2010 16:06:24 -0600 Message-ID: <1291673184.2213.7.camel@aglitke> Mime-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: [Qemu-devel] Re: [RFC][PATCH v5 07/21] virtagent: add va.getfile RPC List-Id: qemu-devel.nongnu.org List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: Michael Roth Cc: agl@linux.vnet.ibm.com, stefanha@linux.vnet.ibm.com, Jes.Sorensen@redhat.com, qemu-devel@nongnu.org, aliguori@linux.vnet.ibm.com, ryanh@us.ibm.com, abeekhof@redhat.com On Fri, 2010-12-03 at 12:03 -0600, Michael Roth wrote: > Add RPC to retrieve a guest file. This interface is intended > for smaller reads like peeking at logs and /proc and such. > > Signed-off-by: Michael Roth > --- > virtagent-server.c | 59 ++++++++++++++++++++++++++++++++++++++++++++++++++++ > 1 files changed, 59 insertions(+), 0 deletions(-) > > diff --git a/virtagent-server.c b/virtagent-server.c > index 36fbae2..a430b58 100644 > --- a/virtagent-server.c > +++ b/virtagent-server.c > @@ -26,12 +26,71 @@ static bool va_enable_syslog = false; /* enable syslog'ing of RPCs */ > syslog(LOG_INFO, "virtagent, %s", msg_buf); \ > } while(0) > > +/* RPC functions common to guest/host daemons */ > + > +/* va_getfile(): return file contents > + * rpc return values: > + * - base64-encoded file contents > + */ > +static xmlrpc_value *va_getfile(xmlrpc_env *env, > + xmlrpc_value *param, > + void *user_data) > +{ > + const char *path; > + char *file_contents = NULL; > + char buf[VA_FILEBUF_LEN]; > + int fd, ret, count = 0; > + xmlrpc_value *result = NULL; > + > + /* parse argument array */ > + xmlrpc_decompose_value(env, param, "(s)", &path); > + if (env->fault_occurred) { > + return NULL; > + } > + > + SLOG("va_getfile(), path:%s", path); I would log all calls (even those that would fail xmlrpc_decompose_value(). You might catch someone trying to do something tricky. > + > + fd = open(path, O_RDONLY); > + if (fd == -1) { > + LOG("open failed: %s", strerror(errno)); > + xmlrpc_faultf(env, "open failed: %s", strerror(errno)); > + return NULL; > + } > + > + while ((ret = read(fd, buf, VA_FILEBUF_LEN)) > 0) { > + file_contents = qemu_realloc(file_contents, count + VA_FILEBUF_LEN); > + memcpy(file_contents + count, buf, ret); > + count += ret; > + if (count > VA_GETFILE_MAX) { > + xmlrpc_faultf(env, "max file size (%d bytes) exceeded", > + VA_GETFILE_MAX); > + goto EXIT_CLOSE_BAD; > + } > + } > + if (ret == -1) { > + LOG("read failed: %s", strerror(errno)); > + xmlrpc_faultf(env, "read failed: %s", strerror(errno)); > + goto EXIT_CLOSE_BAD; > + } > + > + result = xmlrpc_build_value(env, "6", file_contents, count); > + > +EXIT_CLOSE_BAD: > + if (file_contents) { > + qemu_free(file_contents); > + } > + close(fd); > + return result; > +} > + > typedef struct RPCFunction { > xmlrpc_value *(*func)(xmlrpc_env *env, xmlrpc_value *param, void *unused); > const char *func_name; > } RPCFunction; > > static RPCFunction guest_functions[] = { > + { .func = va_getfile, > + .func_name = "va.getfile" }, > { NULL, NULL } > }; > static RPCFunction host_functions[] = { -- Thanks, Adam