From patchwork Fri Apr 5 09:30:22 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Hans de Goede X-Patchwork-Id: 234082 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from lists.gnu.org (lists.gnu.org [208.118.235.17]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (Client did not present a certificate) by ozlabs.org (Postfix) with ESMTPS id 8C2F72C00AD for ; Fri, 5 Apr 2013 20:30:27 +1100 (EST) Received: from localhost ([::1]:55436 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1UO2yX-0005sB-Ou for incoming@patchwork.ozlabs.org; Fri, 05 Apr 2013 05:30:25 -0400 Received: from eggs.gnu.org ([208.118.235.92]:59200) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1UO2vI-0000pX-LP for qemu-devel@nongnu.org; Fri, 05 Apr 2013 05:27:14 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1UO2vD-00055A-Hk for qemu-devel@nongnu.org; Fri, 05 Apr 2013 05:27:04 -0400 Received: from mx1.redhat.com ([209.132.183.28]:65485) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1UO2vD-000550-9n for qemu-devel@nongnu.org; Fri, 05 Apr 2013 05:26:59 -0400 Received: from int-mx09.intmail.prod.int.phx2.redhat.com (int-mx09.intmail.prod.int.phx2.redhat.com [10.5.11.22]) by mx1.redhat.com (8.14.4/8.14.4) with ESMTP id r359QwvB010035 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=OK) for ; Fri, 5 Apr 2013 05:26:58 -0400 Received: from shalem.localdomain.com (vpn1-5-204.ams2.redhat.com [10.36.5.204]) by int-mx09.intmail.prod.int.phx2.redhat.com (8.14.4/8.14.4) with ESMTP id r359QpNK032141; Fri, 5 Apr 2013 05:26:57 -0400 From: Hans de Goede To: Gerd Hoffmann Date: Fri, 5 Apr 2013 11:30:22 +0200 Message-Id: <1365154225-9443-5-git-send-email-hdegoede@redhat.com> In-Reply-To: <1365154225-9443-1-git-send-email-hdegoede@redhat.com> References: <1365154225-9443-1-git-send-email-hdegoede@redhat.com> X-Scanned-By: MIMEDefang 2.68 on 10.5.11.22 X-detected-operating-system: by eggs.gnu.org: GNU/Linux 3.x X-Received-From: 209.132.183.28 Cc: Hans de Goede , qemu-devel@nongnu.org Subject: [Qemu-devel] [PATCH 4/7] spice-qemu-char: Add watch support X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Sender: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Signed-off-by: Hans de Goede --- spice-qemu-char.c | 67 +++++++++++++++++++++++++++++++++++++++++++++++++++---- 1 file changed, 63 insertions(+), 4 deletions(-) diff --git a/spice-qemu-char.c b/spice-qemu-char.c index c4f81cf..097a8c8 100644 --- a/spice-qemu-char.c +++ b/spice-qemu-char.c @@ -13,12 +13,18 @@ typedef struct SpiceCharDriver { SpiceCharDeviceInstance sin; char *subtype; bool active; + bool blocked; uint8_t *buffer; uint8_t *datapos; ssize_t bufsize, datalen; QLIST_ENTRY(SpiceCharDriver) next; } SpiceCharDriver; +typedef struct SpiceCharSource { + GSource source; + SpiceCharDriver *scd; +} SpiceCharSource; + static QLIST_HEAD(, SpiceCharDriver) spice_chars = QLIST_HEAD_INITIALIZER(spice_chars); @@ -54,9 +60,10 @@ static int vmc_read(SpiceCharDeviceInstance *sin, uint8_t *buf, int len) scd->datapos += bytes; scd->datalen -= bytes; assert(scd->datalen >= 0); - if (scd->datalen == 0) { - scd->datapos = 0; - } + } + if (scd->datalen == 0) { + scd->datapos = 0; + scd->blocked = false; } trace_spice_vmc_read(bytes, len); return bytes; @@ -129,10 +136,54 @@ static void vmc_unregister_interface(SpiceCharDriver *scd) trace_spice_vmc_unregister_interface(scd); } +static gboolean spice_char_source_prepare(GSource *source, gint *timeout) +{ + SpiceCharSource *src = (SpiceCharSource *)source; + + *timeout = -1; + + return !src->scd->blocked; +} + +static gboolean spice_char_source_check(GSource *source) +{ + SpiceCharSource *src = (SpiceCharSource *)source; + + return !src->scd->blocked; +} + +static gboolean spice_char_source_dispatch(GSource *source, + GSourceFunc callback, gpointer user_data) +{ + GIOFunc func = (GIOFunc)callback; + + return func(NULL, G_IO_OUT, user_data); +} + +GSourceFuncs SpiceCharSourceFuncs = { + .prepare = spice_char_source_prepare, + .check = spice_char_source_check, + .dispatch = spice_char_source_dispatch, +}; + +static GSource *spice_chr_add_watch(CharDriverState *chr, GIOCondition cond) +{ + SpiceCharDriver *scd = chr->opaque; + SpiceCharSource *src; + + assert(cond == G_IO_OUT); + + src = (SpiceCharSource *)g_source_new(&SpiceCharSourceFuncs, + sizeof(SpiceCharSource)); + src->scd = scd; + + return (GSource *)src; +} static int spice_chr_write(CharDriverState *chr, const uint8_t *buf, int len) { SpiceCharDriver *s = chr->opaque; + int read_bytes; assert(s->datalen == 0); if (s->bufsize < len) { @@ -143,7 +194,14 @@ static int spice_chr_write(CharDriverState *chr, const uint8_t *buf, int len) s->datapos = s->buffer; s->datalen = len; spice_server_char_device_wakeup(&s->sin); - return len; + read_bytes = len - s->datalen; + if (read_bytes != len) { + /* We'll get passed in the unconsumed data with the next call */ + s->datalen = 0; + s->datapos = NULL; + s->blocked = true; + } + return read_bytes; } static void spice_chr_close(struct CharDriverState *chr) @@ -199,6 +257,7 @@ static CharDriverState *chr_open(const char *subtype) s->sin.subtype = g_strdup(subtype); chr->opaque = s; chr->chr_write = spice_chr_write; + chr->chr_add_watch = spice_chr_add_watch; chr->chr_close = spice_chr_close; chr->chr_set_fe_open = spice_chr_set_fe_open;