[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH 6/7] spice-qemu-char.c: Remove intermediate buffer
From: |
Hans de Goede |
Subject: |
[Qemu-devel] [PATCH 6/7] spice-qemu-char.c: Remove intermediate buffer |
Date: |
Wed, 13 Mar 2013 14:59:46 +0100 |
From: Alon Levy <address@hidden>
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 <address@hidden>
---
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 e9eea0d..99cb315 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;
@@ -202,12 +201,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;
--
1.8.1.4
- [Qemu-devel] [PATCH 0/7] Spice / usb-redir chardev flowcontrol patches, Hans de Goede, 2013/03/13
- [Qemu-devel] [PATCH 1/7] virtio-console: Also throttle when less was written then requested, Hans de Goede, 2013/03/13
- [Qemu-devel] [PATCH 2/7] virtio-console: Remove any pending watches on close, Hans de Goede, 2013/03/13
- [Qemu-devel] [PATCH 4/7] spice-qemu-char: Remove dead debugging code, Hans de Goede, 2013/03/13
- [Qemu-devel] [PATCH 3/7] spice-qemu-char: Fix name parameter issues after qapi-ifying, Hans de Goede, 2013/03/13
- [Qemu-devel] [PATCH 6/7] spice-qemu-char.c: Remove intermediate buffer,
Hans de Goede <=
- [Qemu-devel] [PATCH 5/7] spice-qemu-char: Add watch support, Hans de Goede, 2013/03/13
- [Qemu-devel] [PATCH 7/7] usb-redir: Add flow control support, Hans de Goede, 2013/03/13