diff options
| author | Anthony Liguori <aliguori@us.ibm.com> | 2013-04-16 10:28:51 -0500 |
|---|---|---|
| committer | Anthony Liguori <aliguori@us.ibm.com> | 2013-04-16 10:28:51 -0500 |
| commit | 6f8111a16d9cb3744a7b05726df28ee8cb6d8d30 (patch) | |
| tree | d12f2b812fa9df96b0418e04b2463e6f44294ced /include | |
| parent | 100c533220d70ae9732ba63142d71d1c48688f54 (diff) | |
| parent | 75c439bc65c07d76f5e74c734ed5432bc6114a3b (diff) | |
| download | qemu-6f8111a16d9cb3744a7b05726df28ee8cb6d8d30.tar.gz qemu-6f8111a16d9cb3744a7b05726df28ee8cb6d8d30.tar.bz2 qemu-6f8111a16d9cb3744a7b05726df28ee8cb6d8d30.zip | |
Merge remote-tracking branch 'spice/spice.v69' into staging
# By Hans de Goede (5) and others
# Via Gerd Hoffmann
* spice/spice.v69:
spice-qemu-char: vmc_write: Don't write more bytes then we're asked too
spice-qemu-char: Remove intermediate buffer
spice-qemu-char: Add watch support
spice-qemu-char: Remove #ifdef-ed code for old spice-server compat
virtio-console: Remove any pending watches on close
virtio-console: Also throttle when less was written then requested
spice: (32 bit only) fix surface cmd tracking destruction
qxl: add 2000x2000 and 2048x2048 video modes
qxl: add 4k + 8k resolutions
Message-id: 1366106194-28826-1-git-send-email-kraxel@redhat.com
Signed-off-by: Anthony Liguori <aliguori@us.ibm.com>
Diffstat (limited to 'include')
| -rw-r--r-- | include/hw/virtio/virtio-serial.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/include/hw/virtio/virtio-serial.h b/include/hw/virtio/virtio-serial.h index 7c71304d10..1d2040b245 100644 --- a/include/hw/virtio/virtio-serial.h +++ b/include/hw/virtio/virtio-serial.h @@ -104,7 +104,7 @@ typedef struct VirtIOSerialPortClass { * 'len'. In this case, throttling will be enabled for this port. */ ssize_t (*have_data)(VirtIOSerialPort *port, const uint8_t *buf, - size_t len); + ssize_t len); } VirtIOSerialPortClass; /* |