From patchwork Thu Nov 11 01:37:21 2010 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Michael Roth X-Patchwork-Id: 70747 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 42C6FB7118 for ; Thu, 11 Nov 2010 12:47:40 +1100 (EST) Received: from localhost ([127.0.0.1]:37494 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1PGMG0-0005MN-AX for incoming@patchwork.ozlabs.org; Wed, 10 Nov 2010 20:47:20 -0500 Received: from [140.186.70.92] (port=56452 helo=eggs.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1PGMC0-0007ii-CK for qemu-devel@nongnu.org; Wed, 10 Nov 2010 20:43:18 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1PGM6l-0008Kk-BW for qemu-devel@nongnu.org; Wed, 10 Nov 2010 20:38:03 -0500 Received: from e5.ny.us.ibm.com ([32.97.182.145]:34036) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1PGM6l-0008KG-8N for qemu-devel@nongnu.org; Wed, 10 Nov 2010 20:37:47 -0500 Received: from d01relay07.pok.ibm.com (d01relay07.pok.ibm.com [9.56.227.147]) by e5.ny.us.ibm.com (8.14.4/8.13.1) with ESMTP id oAB1GOJp011355 for ; Wed, 10 Nov 2010 20:16:24 -0500 Received: from d01av01.pok.ibm.com (d01av01.pok.ibm.com [9.56.224.215]) by d01relay07.pok.ibm.com (8.13.8/8.13.8/NCO v10.0) with ESMTP id oAB1bkcr2347082 for ; Wed, 10 Nov 2010 20:37:46 -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 oAB1bkWC009904 for ; Wed, 10 Nov 2010 20:37:46 -0500 Received: from localhost.localdomain (sig-9-65-242-217.mts.ibm.com [9.65.242.217]) by d01av01.pok.ibm.com (8.14.4/8.13.1/NCO v10.0 AVin) with ESMTP id oAB1bY15009666; Wed, 10 Nov 2010 20:37:45 -0500 From: Michael Roth To: qemu-devel@nongnu.org Date: Wed, 10 Nov 2010 19:37:21 -0600 Message-Id: <1289439450-23556-3-git-send-email-mdroth@linux.vnet.ibm.com> X-Mailer: git-send-email 1.7.0.4 In-Reply-To: <1289439450-23556-1-git-send-email-mdroth@linux.vnet.ibm.com> References: <1289439450-23556-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: agl@linux.vnet.ibm.com, abeekhof@redhat.com, mdroth@linux.vnet.ibm.com, aliguori@linux.vnet.ibm.com, ryanh@us.ibm.com, amit.shah@redhat.com Subject: [Qemu-devel] [RFC][PATCH v3 02/11] virtagent: base definitions for host/guest RPC server 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 Basic skeleton code for RPC server. This is shared by both the guest-side RPC server as well as the host-side one (the advertised RPCs for each by guest/host-specific arrays). Signed-off-by: Michael Roth --- virtagent-daemon.c | 194 ++++++++++++++++++++++++++++++++++++++++++++++++++++ virtagent-daemon.h | 22 ++++++ 2 files changed, 216 insertions(+), 0 deletions(-) create mode 100644 virtagent-daemon.c create mode 100644 virtagent-daemon.h diff --git a/virtagent-daemon.c b/virtagent-daemon.c new file mode 100644 index 0000000..0505a81 --- /dev/null +++ b/virtagent-daemon.c @@ -0,0 +1,194 @@ +/* + * virt-agent - host/guest RPC daemon functions + * + * Copyright IBM Corp. 2010 + * + * Authors: + * Adam Litke + * Michael Roth + * + * This work is licensed under the terms of the GNU GPL, version 2 or later. + * See the COPYING file in the top-level directory. + * + */ +#include "qemu_socket.h" +#include "virtagent-daemon.h" +#include "virtagent-common.h" + +static int va_accept(int listen_fd) { + struct sockaddr_in saddr; + struct sockaddr *addr; + socklen_t len; + int fd; + + while (1) { + len = sizeof(saddr); + addr = (struct sockaddr *)&saddr; + fd = qemu_accept(listen_fd, addr, &len); + if (fd < 0 && errno != EINTR) { + LOG("accept() failed"); + break; + } else if (fd >= 0) { + TRACE("accepted connection"); + break; + } + } + return fd; +} + +typedef struct RPCFunction { + xmlrpc_value *(*func)(xmlrpc_env *env, xmlrpc_value *param, void *unused); + const char *func_name; +} RPCFunction; + +static RPCFunction guest_functions[] = { + { NULL, NULL } +}; +static RPCFunction host_functions[] = { + { NULL, NULL } +}; + +static void va_register_functions(xmlrpc_env *env, xmlrpc_registry *registry, + RPCFunction *list) +{ + int i; + for (i = 0; list[i].func != NULL; ++i) { + TRACE("adding func: %s", list[i].func_name); + xmlrpc_registry_add_method(env, registry, NULL, list[i].func_name, + list[i].func, NULL); + } +} + +typedef struct VARPCServerState { + VPDriver *vp; + int listen_fd; + xmlrpc_env env; + xmlrpc_registry *registry; +} VARPCServerState; + +/* only one virtagent server instance can exist at a time */ +static VARPCServerState *server_state = NULL; + +static void va_accept_handler(void *opaque); + +static void va_rpc_send_cb(void *opaque) +{ + VARPCData *rpc_data = opaque; + VARPCServerState *s = server_state; + + TRACE("called"); + if (rpc_data->status != VA_RPC_STATUS_OK) { + LOG("error sending RPC response"); + } else { + TRACE("RPC completed"); + } + + TRACE("waiting for RPC request..."); + vp_set_fd_handler(s->listen_fd, va_accept_handler, NULL, s); +} + +static void va_rpc_read_cb(void *opaque) +{ + VARPCData *rpc_data = opaque; + VARPCServerState *s = server_state; + + TRACE("called"); + if (rpc_data->status != VA_RPC_STATUS_OK) { + LOG("error reading RPC request"); + goto out_bad; + } + + rpc_data->send_resp_xml = + xmlrpc_registry_process_call(&s->env, s->registry, NULL, + rpc_data->req_xml, rpc_data->req_xml_len); + if (rpc_data->send_resp_xml == NULL) { + LOG("error handling RPC request"); + goto out_bad; + } + + rpc_data->cb = va_rpc_send_cb; + return; + +out_bad: + TRACE("waiting for RPC request..."); + vp_set_fd_handler(s->listen_fd, va_accept_handler, NULL, s); +} + +static void va_accept_handler(void *opaque) +{ + VARPCData *rpc_data; + int ret, fd; + + TRACE("called"); + fd = va_accept(server_state->listen_fd); + if (fd < 0) { + TRACE("connection error: %s", strerror(errno)); + return; + } + ret = fcntl(fd, F_GETFL); + ret = fcntl(fd, F_SETFL, ret | O_NONBLOCK); + + TRACE("RPC client connected, reading RPC request..."); + rpc_data = qemu_mallocz(sizeof(VARPCData)); + rpc_data->cb = va_rpc_read_cb; + ret = va_rpc_read_request(rpc_data, fd); + if (ret != 0) { + LOG("error setting up read handler"); + qemu_free(rpc_data); + return; + } + vp_set_fd_handler(server_state->listen_fd, NULL, NULL, NULL); +} + +int va_server_init(VPDriver *vp_drv, bool is_host) +{ + RPCFunction *func_list = is_host ? host_functions : guest_functions; + QemuOpts *opts; + int ret, fd; + const char *path, *service_id; + + if (server_state) { + LOG("virtagent server already initialized"); + return -1; + } + server_state = qemu_mallocz(sizeof(VARPCServerState)); + service_id = is_host ? HOST_AGENT_SERVICE_ID : GUEST_AGENT_SERVICE_ID; + /* TODO: host agent path needs to be made unique amongst multiple + * qemu instances + */ + path = is_host ? HOST_AGENT_PATH : GUEST_AGENT_PATH; + + /* setup listening socket for server */ + opts = qemu_opts_create(qemu_find_opts("net"), "va_server_opts", 0); + qemu_opt_set(opts, "path", path); + fd = unix_listen_opts(opts); + qemu_opts_del(opts); + if (fd < 0) { + LOG("error setting up listening socket"); + goto out_bad; + } + + /* tell virtproxy to forward incoming virtagent connections to the socket */ + ret = vp_set_iforward(vp_drv, service_id, path, NULL, false); + if (ret < 0) { + LOG("error setting up virtproxy iforward"); + goto out_bad; + } + + server_state->vp = vp_drv; + server_state->listen_fd = fd; + xmlrpc_env_init(&server_state->env); + server_state->registry = xmlrpc_registry_new(&server_state->env); + va_register_functions(&server_state->env, server_state->registry, func_list); + + TRACE("waiting for RPC request..."); + vp_set_fd_handler(server_state->listen_fd, va_accept_handler, NULL, + server_state); + + return 0; + +out_bad: + qemu_free(server_state); + server_state = NULL; + return -1; +} diff --git a/virtagent-daemon.h b/virtagent-daemon.h new file mode 100644 index 0000000..6c3436a --- /dev/null +++ b/virtagent-daemon.h @@ -0,0 +1,22 @@ +/* + * virt-agent - host/guest RPC daemon functions + * + * Copyright IBM Corp. 2010 + * + * Authors: + * Michael Roth + * + * This work is licensed under the terms of the GNU GPL, version 2 or later. + * See the COPYING file in the top-level directory. + * + */ +#include "virtproxy.h" + +#define GUEST_AGENT_SERVICE_ID "virtagent" +#define GUEST_AGENT_PATH "/tmp/virtagent-guest.sock" +#define HOST_AGENT_SERVICE_ID "virtagent-host" +#define HOST_AGENT_PATH "/tmp/virtagent-host.sock" +#define VA_GETFILE_MAX 1 << 30 +#define VA_FILEBUF_LEN 16384 + +int va_server_init(VPDriver *vp_drv, bool is_host);