From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from [140.186.70.92] (port=42857 helo=eggs.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1PGJDN-0008Ja-Ff for qemu-devel@nongnu.org; Wed, 10 Nov 2010 17:32:29 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1PGJ9i-0007p9-I8 for qemu-devel@nongnu.org; Wed, 10 Nov 2010 17:28:39 -0500 Received: from e8.ny.us.ibm.com ([32.97.182.138]:57136) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1PGJ9i-0007p5-EE for qemu-devel@nongnu.org; Wed, 10 Nov 2010 17:28:38 -0500 Received: from d01relay01.pok.ibm.com (d01relay01.pok.ibm.com [9.56.227.233]) by e8.ny.us.ibm.com (8.14.4/8.13.1) with ESMTP id oAAMBlrg002777 for ; Wed, 10 Nov 2010 17:11:47 -0500 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 oAAMSbn6365244 for ; Wed, 10 Nov 2010 17:28:37 -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 oAAMSbmY002400 for ; Wed, 10 Nov 2010 17:28:37 -0500 From: Michael Roth Date: Wed, 10 Nov 2010 16:28:04 -0600 Message-Id: <1289428095-5059-9-git-send-email-mdroth@linux.vnet.ibm.com> In-Reply-To: <1289428095-5059-1-git-send-email-mdroth@linux.vnet.ibm.com> References: <1289428095-5059-1-git-send-email-mdroth@linux.vnet.ibm.com> Subject: [Qemu-devel] [RFC][PATCH v2 08/19] virtproxy: add vp_new() VPDriver constructor 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, abeekhof@redhat.com, mdroth@linux.vnet.ibm.com, aliguori@linux.vnet.ibm.com, ryanh@us.ibm.com, amit.shah@redhat.com Signed-off-by: Michael Roth --- virtproxy.c | 40 ++++++++++++++++++++++++++++++++++++++++ virtproxy.h | 6 ++++++ 2 files changed, 46 insertions(+), 0 deletions(-) diff --git a/virtproxy.c b/virtproxy.c index 091a223..401d51c 100644 --- a/virtproxy.c +++ b/virtproxy.c @@ -359,3 +359,43 @@ static void vp_channel_read(void *opaque) LOG("error handling packet stream"); } } + +VPDriver *vp_new(enum vp_context ctx, CharDriverState *s, int fd, bool listen) +{ + VPDriver *drv = NULL; + + drv = qemu_mallocz(sizeof(VPDriver)); + drv->listen_fd = -1; + drv->channel_fd = -1; + drv->chr = s; + drv->ctx = ctx; + QLIST_INIT(&drv->oforwards); + QLIST_INIT(&drv->conns); + + if (ctx == VP_CTX_CHARDEV) { + if (drv->chr == NULL) { + LOG("invalid virtproxy chardev"); + goto out_bad; + } + } else if (ctx == VP_CTX_FD) { + if (fd <= 0) { + LOG("invalid FD"); + goto out_bad; + } else if (listen) { + /* provided FD is to be listened on for channel connection */ + drv->listen_fd = fd; + vp_set_fd_handler(drv->listen_fd, vp_channel_accept, NULL, drv); + } else { + drv->channel_fd = fd; + vp_set_fd_handler(drv->channel_fd, vp_channel_read, NULL, drv); + } + } else { + LOG("invalid context"); + goto out_bad; + } + + return drv; +out_bad: + qemu_free(drv); + return NULL; +} diff --git a/virtproxy.h b/virtproxy.h index 8fa0142..7cd2f76 100644 --- a/virtproxy.h +++ b/virtproxy.h @@ -16,8 +16,13 @@ #include "qemu-common.h" #include "qemu-queue.h" +#include "qemu-char.h" typedef struct VPDriver VPDriver; +enum vp_context { + VP_CTX_CHARDEV, /* in qemu/host, channel is a virtproxy chardev */ + VP_CTX_FD, /* in guest, channel is an FD */ +}; /* wrappers for s/vp/qemu/ functions we need */ int vp_send_all(int fd, const void *buf, int len1); @@ -33,6 +38,7 @@ int vp_set_fd_handler(int fd, void vp_chr_read(CharDriverState *s, uint8_t *buf, int len); /* virtproxy interface */ +VPDriver *vp_new(enum vp_context ctx, CharDriverState *s, int fd, bool listen); int vp_handle_packet_buf(VPDriver *drv, const void *buf, int count); #endif /* VIRTPROXY_H */ -- 1.7.0.4