diff options
author | Peter Maydell | 2021-03-04 13:58:50 +0100 |
---|---|---|
committer | Peter Maydell | 2021-03-04 13:58:50 +0100 |
commit | fe352f5c0056b4d21ae033ec49acc0bce9897e53 (patch) | |
tree | 5dabd93c86901bac296940d138ed7bb9b1b680df /docs | |
parent | Merge remote-tracking branch 'remotes/dgilbert-gitlab/tags/pull-virtiofs-2021... (diff) | |
parent | virtio-gpu: Do not distinguish the primary console (diff) | |
download | qemu-fe352f5c0056b4d21ae033ec49acc0bce9897e53.tar.gz qemu-fe352f5c0056b4d21ae033ec49acc0bce9897e53.tar.xz qemu-fe352f5c0056b4d21ae033ec49acc0bce9897e53.zip |
Merge remote-tracking branch 'remotes/kraxel/tags/ui-20210304-pull-request' into staging
ui/console: message surface tweaks.
ui/cocoa: bugfixes and cleanups.
# gpg: Signature made Thu 04 Mar 2021 08:36:53 GMT
# gpg: using RSA key A0328CFFB93A17A79901FE7D4CB6D8EED3E87138
# gpg: Good signature from "Gerd Hoffmann (work) <kraxel@redhat.com>" [full]
# gpg: aka "Gerd Hoffmann <gerd@kraxel.org>" [full]
# gpg: aka "Gerd Hoffmann (private) <kraxel@gmail.com>" [full]
# Primary key fingerprint: A032 8CFF B93A 17A7 9901 FE7D 4CB6 D8EE D3E8 7138
* remotes/kraxel/tags/ui-20210304-pull-request:
virtio-gpu: Do not distinguish the primary console
ui/console: Pass placeholder surface to displays
ui/console: Add placeholder flag to message surface
ui/cocoa: Replace fprintf with error_report
configure: Improve OpenGL dependency detections
ui/cocoa: Fix stride resolution of pixman image
ui/gtk: vte: fix sending multiple characeters
ui/cocoa: Remove the uses of full screen APIs
Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
Diffstat (limited to 'docs')
-rw-r--r-- | docs/interop/vhost-user.json | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/docs/interop/vhost-user.json b/docs/interop/vhost-user.json index feb5fe58ca..b6ade9e493 100644 --- a/docs/interop/vhost-user.json +++ b/docs/interop/vhost-user.json @@ -250,7 +250,8 @@ # "type": "gpu", # "binary": "/usr/libexec/qemu/vhost-user-gpu", # "tags": [ -# "CONFIG_OPENGL_DMABUF=y" +# "CONFIG_OPENGL=y", +# "CONFIG_GBM=y" # ] # } # |