From patchwork Fri Oct 22 18:45:59 2010 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Michael Roth X-Patchwork-Id: 68931 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 A21BCB70DE for ; Sat, 23 Oct 2010 06:22:16 +1100 (EST) Received: from localhost ([127.0.0.1]:56053 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1P9NBs-00014k-OW for incoming@patchwork.ozlabs.org; Fri, 22 Oct 2010 15:22:12 -0400 Received: from [140.186.70.92] (port=60050 helo=eggs.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1P9MdZ-00007B-3D for qemu-devel@nongnu.org; Fri, 22 Oct 2010 14:46:50 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1P9MdV-0002fa-GU for qemu-devel@nongnu.org; Fri, 22 Oct 2010 14:46:44 -0400 Received: from e5.ny.us.ibm.com ([32.97.182.145]:53672) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1P9MdV-0002fL-9x for qemu-devel@nongnu.org; Fri, 22 Oct 2010 14:46:41 -0400 Received: from d01relay01.pok.ibm.com (d01relay01.pok.ibm.com [9.56.227.233]) by e5.ny.us.ibm.com (8.14.4/8.13.1) with ESMTP id o9MIPrmE024522 for ; Fri, 22 Oct 2010 14:25:53 -0400 Received: from d01av01.pok.ibm.com (d01av01.pok.ibm.com [9.56.224.215]) by d01relay01.pok.ibm.com (8.13.8/8.13.8/NCO v10.0) with ESMTP id o9MIkeL5409170 for ; Fri, 22 Oct 2010 14:46:40 -0400 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 o9MIkeZI027638 for ; Fri, 22 Oct 2010 14:46:40 -0400 Received: from localhost.localdomain (sig-9-76-202-211.mts.ibm.com [9.76.202.211]) by d01av01.pok.ibm.com (8.14.4/8.13.1/NCO v10.0 AVin) with ESMTP id o9MIkHq3025601; Fri, 22 Oct 2010 14:46:39 -0400 From: Michael Roth To: qemu-devel@nongnu.org Date: Fri, 22 Oct 2010 13:45:59 -0500 Message-Id: <1287773165-24855-5-git-send-email-mdroth@linux.vnet.ibm.com> X-Mailer: git-send-email 1.7.0.4 In-Reply-To: <1287773165-24855-1-git-send-email-mdroth@linux.vnet.ibm.com> References: <1287773165-24855-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 04/10] virtagent: base RPC client definitions 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 Base skeleton and helpers for executing RPC commands. Monitor commands will result in a connect() being issued to the virtagent service socket, which will then be transported to the listening RPC server in the guest via the virtproxy layer, RPC requests are then sent/recieved via http over the resulting connection. Signed-off-by: Michael Roth --- monitor.c | 1 + qerror.c | 4 ++ qerror.h | 3 ++ virtagent.c | 96 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ virtagent.h | 25 +++++++++++++++ 5 files changed, 129 insertions(+), 0 deletions(-) create mode 100644 virtagent.c create mode 100644 virtagent.h diff --git a/monitor.c b/monitor.c index 260cc02..6c99206 100644 --- a/monitor.c +++ b/monitor.c @@ -42,6 +42,7 @@ #include "audio/audio.h" #include "disas.h" #include "balloon.h" +#include "virtagent.h" #include "qemu-timer.h" #include "migration.h" #include "kvm.h" diff --git a/qerror.c b/qerror.c index ac2cdaf..2f111a9 100644 --- a/qerror.c +++ b/qerror.c @@ -200,6 +200,10 @@ static const QErrorStringTable qerror_table[] = { .error_fmt = QERR_VNC_SERVER_FAILED, .desc = "Could not start VNC server on %(target)", }, + { + .error_fmt = QERR_RPC_FAILED, + .desc = "An RPC error has occurred", + }, {} }; diff --git a/qerror.h b/qerror.h index 943a24b..43cce4a 100644 --- a/qerror.h +++ b/qerror.h @@ -165,4 +165,7 @@ QError *qobject_to_qerror(const QObject *obj); #define QERR_VNC_SERVER_FAILED \ "{ 'class': 'VNCServerFailed', 'data': { 'target': %s } }" +#define QERR_RPC_FAILED \ + "{ 'class': 'RPCFailed', 'data': { 'code': %i, 'message': %s } }" + #endif /* QERROR_H */ diff --git a/virtagent.c b/virtagent.c new file mode 100644 index 0000000..2234bef --- /dev/null +++ b/virtagent.c @@ -0,0 +1,96 @@ +/* + * virt-agent - host/guest RPC client 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 "sysemu.h" +#include "monitor.h" +#include "qjson.h" +#include "qint.h" +#include "cpu-common.h" +#include "kvm.h" +#include "trace.h" +#include "qemu_socket.h" +#include "xmlrpc.h" +#include "xmlrpc_client.h" +#include "virtagent-daemon.h" +#include "virtagent-common.h" +#include "virtagent.h" + +static int rpc_has_error(xmlrpc_env *env) +{ + if (env->fault_occurred) { + LOG("An RPC error has occurred (%i): %s\n", env->fault_code, env->fault_string); + //qerror_report(QERR_RPC_FAILED, env->fault_code, env->fault_string); + return -1; + } + return 0; +} + +/* + * Get a connected socket that can be used to make an RPC call + * This interface will eventually return the connected virtproxy socket for the + * virt-agent channel + */ +static int get_transport_fd(void) +{ + /* TODO: eventually this will need a path that is unique to other + * instances of qemu-vp/qemu. for the integrated qemu-vp we should + * explore the possiblity of not requiring a unix socket under the + * covers, as well as having client init code set up the oforward + * for the service rather than qemu-vp + */ + int ret; + int fd = unix_connect(GUEST_AGENT_PATH_CLIENT); + if (fd < 0) { + LOG("failed to connect to virtagent service"); + } + ret = fcntl(fd, F_GETFL); + ret = fcntl(fd, F_SETFL, ret | O_NONBLOCK); + return fd; +} + +static int rpc_execute(xmlrpc_env *const env, const char *function, + xmlrpc_value *params, RPCRequest *rpc_data) +{ + xmlrpc_mem_block *call_xml; + int fd, ret; + + fd = get_transport_fd(); + if (fd < 0) { + LOG("invalid fd"); + ret = -1; + goto out; + } + + call_xml = XMLRPC_MEMBLOCK_NEW(char, env, 0); + xmlrpc_serialize_call(env, call_xml, function, params); + if (rpc_has_error(env)) { + ret = -EREMOTE; + goto out_callxml; + } + + rpc_data->req_xml = call_xml; + ret = va_transport_rpc_call(fd, rpc_data); + if (ret != 0) { + ret = -1; + goto out_callxml; + } else { + ret = 0; + goto out; + } + +out_callxml: + XMLRPC_MEMBLOCK_FREE(char, call_xml); +out: + return ret; +} diff --git a/virtagent.h b/virtagent.h new file mode 100644 index 0000000..abdb32a --- /dev/null +++ b/virtagent.h @@ -0,0 +1,25 @@ +/* + * virt-agent - host/guest RPC client 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. + * + */ + +#ifndef VIRTAGENT_H +#define VIRTAGENT_H + +#include "monitor.h" +#include "virtagent-common.h" + +#define GUEST_AGENT_PATH_CLIENT "/tmp/virtagent-guest-client.sock" +#define HOST_AGENT_PATH_CLIENT "/tmp/virtagent-host-client.sock" +#define VA_MAX_CHUNK_SIZE 4096 /* max bytes at a time for get/send file */ + +#endif /* VIRTAGENT_H */