From patchwork Tue Nov 16 01:15: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: 71345 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 9A6AEB712C for ; Tue, 16 Nov 2010 12:44:26 +1100 (EST) Received: from localhost ([127.0.0.1]:54055 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1PIAJa-0002mX-8D for incoming@patchwork.ozlabs.org; Mon, 15 Nov 2010 20:26:30 -0500 Received: from [140.186.70.92] (port=60564 helo=eggs.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1PIAAN-0006YG-Ph for qemu-devel@nongnu.org; Mon, 15 Nov 2010 20:17:01 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1PIAAM-0006v0-G6 for qemu-devel@nongnu.org; Mon, 15 Nov 2010 20:16:59 -0500 Received: from e1.ny.us.ibm.com ([32.97.182.141]:51777) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1PIAAM-0006uq-Dj for qemu-devel@nongnu.org; Mon, 15 Nov 2010 20:16:58 -0500 Received: from d01relay06.pok.ibm.com (d01relay06.pok.ibm.com [9.56.227.116]) by e1.ny.us.ibm.com (8.14.4/8.13.1) with ESMTP id oAG19E9t005811 for ; Mon, 15 Nov 2010 20:09:14 -0500 Received: from d01av01.pok.ibm.com (d01av01.pok.ibm.com [9.56.224.215]) by d01relay06.pok.ibm.com (8.13.8/8.13.8/NCO v10.0) with ESMTP id oAG1GvJB2347010 for ; Mon, 15 Nov 2010 20:16:57 -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 oAG1GveA028051 for ; Mon, 15 Nov 2010 20:16:57 -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 oAG1GLHv025826; Mon, 15 Nov 2010 20:16:56 -0500 From: Michael Roth To: qemu-devel@nongnu.org Date: Mon, 15 Nov 2010 19:15:59 -0600 Message-Id: <1289870175-14880-6-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 05/21] virtproxy, add vp_channel_send_all 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 This handles sending of data to channel fd (qemu-vp in guest) or the device associated with the virtproxy chardev for the host depending on the context. vp_chr_read() wraps qemu_chr_read(), it'll be defined later in virtproxy-builtin.c, and noop'd in the guest agent via qemu-vp.c. Signed-off-by: Michael Roth --- virtproxy.c | 31 +++++++++++++++++++++++++++++++ virtproxy.h | 1 + 2 files changed, 32 insertions(+), 0 deletions(-) diff --git a/virtproxy.c b/virtproxy.c index 2cfd905..edca62e 100644 --- a/virtproxy.c +++ b/virtproxy.c @@ -152,6 +152,37 @@ static QemuOptsList vp_socket_opts = { }, }; +static int vp_channel_send_all(VPDriver *drv, uint8_t *buf, int count) +{ + int ret; + CharDriverState *chr = drv->chr; + + if (drv->chr != NULL) { + /* send data to guest via channel device's read handler */ + vp_chr_read(chr, buf, count); + /* TODO: we assume here the full buffer was written to device + * due to the dev write handler being a void function. + * can we confirm? Do we need to? + */ + ret = count; + } else if (drv->channel_fd != -1) { + /* send data to host via channel fd */ + ret = vp_send_all(drv->channel_fd, buf, count); + if (ret == -1) { + LOG("error sending data"); + goto out_bad; + } + } else { + LOG("driver in unknown state"); + goto out_bad; + } + + return ret; +out_bad: + LOG("unable to send to channel"); + return -1; +} + /* get VPConn by fd, "client" denotes whether to look for client or server */ static VPConn *get_conn(const VPDriver *drv, int fd, bool client) { diff --git a/virtproxy.h b/virtproxy.h index 0203421..1a5e56a 100644 --- a/virtproxy.h +++ b/virtproxy.h @@ -30,5 +30,6 @@ int vp_set_fd_handler(int fd, IOHandler *fd_read, IOHandler *fd_write, void *opaque); +void vp_chr_read(CharDriverState *s, uint8_t *buf, int len); #endif /* VIRTPROXY_H */