From patchwork Thu Mar 14 16:36:54 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: 227744 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 93E0D2C0092 for ; Fri, 15 Mar 2013 03:39:06 +1100 (EST) Received: from localhost ([::1]:37774 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1UGBBI-0004LD-Rb for incoming@patchwork.ozlabs.org; Thu, 14 Mar 2013 12:39:04 -0400 Received: from eggs.gnu.org ([208.118.235.92]:56958) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1UGB6L-00051j-F6 for qemu-devel@nongnu.org; Thu, 14 Mar 2013 12:34:02 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1UGB6E-0006Ze-AQ for qemu-devel@nongnu.org; Thu, 14 Mar 2013 12:33:57 -0400 Received: from mx1.redhat.com ([209.132.183.28]:21262) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1UGB6D-0006ZK-Mi for qemu-devel@nongnu.org; Thu, 14 Mar 2013 12:33:50 -0400 Received: from int-mx02.intmail.prod.int.phx2.redhat.com (int-mx02.intmail.prod.int.phx2.redhat.com [10.5.11.12]) by mx1.redhat.com (8.14.4/8.14.4) with ESMTP id r2EGXmIh014976 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=OK) for ; Thu, 14 Mar 2013 12:33:48 -0400 Received: from shalem.localdomain.com (vpn1-4-60.ams2.redhat.com [10.36.4.60]) by int-mx02.intmail.prod.int.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id r2EGXbcY007233; Thu, 14 Mar 2013 12:33:47 -0400 From: Hans de Goede To: qemu-devel@nongnu.org Date: Thu, 14 Mar 2013 17:36:54 +0100 Message-Id: <1363279017-3894-6-git-send-email-hdegoede@redhat.com> In-Reply-To: <1363279017-3894-1-git-send-email-hdegoede@redhat.com> References: <1363279017-3894-1-git-send-email-hdegoede@redhat.com> X-Scanned-By: MIMEDefang 2.67 on 10.5.11.12 X-detected-operating-system: by eggs.gnu.org: GNU/Linux 3.x X-Received-From: 209.132.183.28 Cc: Amit Shah , Alon Levy , =?UTF-8?q?Marc-Andr=C3=A9=20Lureau?= , Gerd Hoffmann , Hans de Goede Subject: [Qemu-devel] [PATCH 5/8] spice-qemu-char: Remove intermediate buffer 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 From: Alon Levy virtio-serial's buffer is valid when it calls us, and we don't access it otherwise: vmc_read is only called in response to wakeup, or else we set datalen=0 and throttle. Then vmc_read is called back, we return 0 (not accessing the buffer) and set the timer to unthrottle. Also make datalen int and not ssize_t (to fit spice_chr_write signature). HdG: Update to apply to spice-qemu-char with new gio-channel based flowcontrol support. Signed-off-by: Hans de Goede --- spice-qemu-char.c | 12 +++--------- 1 file changed, 3 insertions(+), 9 deletions(-) diff --git a/spice-qemu-char.c b/spice-qemu-char.c index ddaf5b3..607abb6 100644 --- a/spice-qemu-char.c +++ b/spice-qemu-char.c @@ -14,9 +14,8 @@ typedef struct SpiceCharDriver { char *subtype; bool active; bool blocked; - uint8_t *buffer; - uint8_t *datapos; - ssize_t bufsize, datalen; + const uint8_t *datapos; + int datalen; QLIST_ENTRY(SpiceCharDriver) next; } SpiceCharDriver; @@ -187,12 +186,7 @@ static int spice_chr_write(CharDriverState *chr, const uint8_t *buf, int len) vmc_register_interface(s); assert(s->datalen == 0); - if (s->bufsize < len) { - s->bufsize = len; - s->buffer = g_realloc(s->buffer, s->bufsize); - } - memcpy(s->buffer, buf, len); - s->datapos = s->buffer; + s->datapos = buf; s->datalen = len; spice_server_char_device_wakeup(&s->sin); read_bytes = len - s->datalen;