From patchwork Tue Nov 16 01:16:02 2010 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Michael Roth X-Patchwork-Id: 71342 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 BA1BFB7131 for ; Tue, 16 Nov 2010 12:42:24 +1100 (EST) Received: from localhost ([127.0.0.1]:54053 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1PIAJa-0002mT-UE for incoming@patchwork.ozlabs.org; Mon, 15 Nov 2010 20:26:30 -0500 Received: from [140.186.70.92] (port=60645 helo=eggs.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1PIAAR-0006bZ-OB for qemu-devel@nongnu.org; Mon, 15 Nov 2010 20:17:07 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1PIAAO-0006w2-T2 for qemu-devel@nongnu.org; Mon, 15 Nov 2010 20:17:03 -0500 Received: from e6.ny.us.ibm.com ([32.97.182.146]:43311) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1PIAAO-0006vw-Q6 for qemu-devel@nongnu.org; Mon, 15 Nov 2010 20:17:00 -0500 Received: from d01relay01.pok.ibm.com (d01relay01.pok.ibm.com [9.56.227.233]) by e6.ny.us.ibm.com (8.14.4/8.13.1) with ESMTP id oAG1I0kl003472 for ; Mon, 15 Nov 2010 20:18:00 -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 oAG1H0UT397826 for ; Mon, 15 Nov 2010 20:17:00 -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 oAG1GxEF028172 for ; Mon, 15 Nov 2010 20:17:00 -0500 Received: from localhost.localdomain (illuin.austin.ibm.com [9.53.41.162]) by d01av01.pok.ibm.com (8.14.4/8.13.1/NCO v10.0 AVin) with ESMTP id oAG1GLI0025826; Mon, 15 Nov 2010 20:16:59 -0500 From: Michael Roth To: qemu-devel@nongnu.org Date: Mon, 15 Nov 2010 19:16:02 -0600 Message-Id: <1289870175-14880-9-git-send-email-mdroth@linux.vnet.ibm.com> X-Mailer: git-send-email 1.7.0.4 In-Reply-To: <1289870175-14880-1-git-send-email-mdroth@linux.vnet.ibm.com> References: <1289870175-14880-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 08/21] virtproxy: add vp_new() VPDriver constructor 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 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 */