diff options
| author | Peter Maydell | 2017-02-27 20:19:46 +0100 |
|---|---|---|
| committer | Peter Maydell | 2017-02-27 20:19:46 +0100 |
| commit | 9b9fbe8a4e9eec9072ee2697a6af59144442785f (patch) | |
| tree | b6a571c3043a91769fec5e22f616d4b306063f01 /ui/spice-core.c | |
| parent | Merge remote-tracking branch 'remotes/berrange/tags/pull-qcrypto-2017-02-27-1... (diff) | |
| parent | vnc: fix double free issues (diff) | |
| download | qemu-9b9fbe8a4e9eec9072ee2697a6af59144442785f.tar.gz qemu-9b9fbe8a4e9eec9072ee2697a6af59144442785f.tar.xz qemu-9b9fbe8a4e9eec9072ee2697a6af59144442785f.zip | |
Merge remote-tracking branch 'remotes/kraxel/tags/pull-ui-20170227-1' into staging
gtk: fix kbd on xwayland
vnc: fix double free issues
opengl improvements
# gpg: Signature made Mon 27 Feb 2017 16:11:30 GMT
# 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-20170227-1:
vnc: fix double free issues
spice: add display & head options
ui: Use XkbGetMap and XkbGetNames instead of XkbGetKeyboard
gtk-egl: add scanout_disable support
sdl2: add scanout_disable support
spice: add scanout_disable support
virtio-gpu: use dpy_gl_scanout_disable
console: add dpy_gl_scanout_disable
console: rename dpy_gl_scanout to dpy_gl_scanout_texture
Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
Diffstat (limited to 'ui/spice-core.c')
| -rw-r--r-- | ui/spice-core.c | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/ui/spice-core.c b/ui/spice-core.c index 39ccab7561..804abc5c0f 100644 --- a/ui/spice-core.c +++ b/ui/spice-core.c @@ -497,6 +497,12 @@ static QemuOptsList qemu_spice_opts = { },{ .name = "seamless-migration", .type = QEMU_OPT_BOOL, + },{ + .name = "display", + .type = QEMU_OPT_STRING, + },{ + .name = "head", + .type = QEMU_OPT_NUMBER, #ifdef HAVE_SPICE_GL },{ .name = "gl", |