diff options
| author | Peter Maydell | 2016-09-28 18:15:43 +0200 |
|---|---|---|
| committer | Peter Maydell | 2016-09-28 18:15:43 +0200 |
| commit | 79907e688d07cd3a43c28c563968b57697b6a9cf (patch) | |
| tree | 37639d9515677bbb299614ac3545afecc50ea2f0 /net/net.c | |
| parent | Merge remote-tracking branch 'remotes/sstabellini/tags/xen-20160927-tag' into... (diff) | |
| parent | ui/vnc-enc-tight: remove switch and have single return (diff) | |
| download | qemu-79907e688d07cd3a43c28c563968b57697b6a9cf.tar.gz qemu-79907e688d07cd3a43c28c563968b57697b6a9cf.tar.xz qemu-79907e688d07cd3a43c28c563968b57697b6a9cf.zip | |
Merge remote-tracking branch 'remotes/kraxel/tags/pull-ui-20160928-1' into staging
ui: console+vnc fixes, switch spice to pure opengl with gl=on.
# gpg: Signature made Wed 28 Sep 2016 11:57:35 BST
# gpg: using RSA key 0x4CB6D8EED3E87138
# gpg: Good signature from "Gerd Hoffmann (work) <kraxel@redhat.com>"
# gpg: aka "Gerd Hoffmann <gerd@kraxel.org>"
# gpg: aka "Gerd Hoffmann (private) <kraxel@gmail.com>"
# Primary key fingerprint: A032 8CFF B93A 17A7 9901 FE7D 4CB6 D8EE D3E8 7138
* remotes/kraxel/tags/pull-ui-20160928-1:
ui/vnc-enc-tight: remove switch and have single return
spice/gl: render DisplaySurface via opengl
console: track gl_block state in QemuConsole
console: skip same-size resize
Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
Diffstat (limited to 'net/net.c')
0 files changed, 0 insertions, 0 deletions