From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([208.118.235.92]:59203) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1UO2vK-0000qE-G0 for qemu-devel@nongnu.org; Fri, 05 Apr 2013 05:27:11 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1UO2vE-00055j-SE for qemu-devel@nongnu.org; Fri, 05 Apr 2013 05:27:06 -0400 Received: from mx1.redhat.com ([209.132.183.28]:39761) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1UO2vE-00055Z-K7 for qemu-devel@nongnu.org; Fri, 05 Apr 2013 05:27:00 -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 r359R0Hh002479 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=OK) for ; Fri, 5 Apr 2013 05:27:00 -0400 From: Hans de Goede Date: Fri, 5 Apr 2013 11:30:23 +0200 Message-Id: <1365154225-9443-6-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> Subject: [Qemu-devel] [PATCH 5/7] spice-qemu-char: Remove intermediate buffer List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: Gerd Hoffmann Cc: Hans de Goede , Alon Levy , qemu-devel@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 097a8c8..7e6bd2d 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; @@ -186,12 +185,7 @@ static int spice_chr_write(CharDriverState *chr, const uint8_t *buf, int len) int read_bytes; 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; -- 1.8.1.4