From: Anthony Liguori Date: Tue, 16 Apr 2013 15:28:51 +0000 (-0500) Subject: Merge remote-tracking branch 'spice/spice.v69' into staging X-Git-Url: https://repo.jachan.dev/qemu.git/commitdiff_plain/6f8111a16d9cb3744a7b05726df28ee8cb6d8d30 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 --- 6f8111a16d9cb3744a7b05726df28ee8cb6d8d30