summary refs log tree commit diff stats
path: root/ui/sdl2-gl.c
diff options
context:
space:
mode:
authorPeter Maydell <peter.maydell@linaro.org>2017-10-16 10:22:39 +0100
committerPeter Maydell <peter.maydell@linaro.org>2017-10-16 10:22:39 +0100
commit40a1e8ac2e10155b5df13a2508ac080b00cd7e23 (patch)
tree891376c9ace90e648f1d78294e2840afb2d85bf8 /ui/sdl2-gl.c
parentf90ea7ba7c5ae7010ee0ce062207ae42530f57d6 (diff)
parent13384f158ce043744cf7542162a34953c7e05a70 (diff)
downloadfocaccia-qemu-40a1e8ac2e10155b5df13a2508ac080b00cd7e23.tar.gz
focaccia-qemu-40a1e8ac2e10155b5df13a2508ac080b00cd7e23.zip
Merge remote-tracking branch 'remotes/elmarco/tags/vu-pull-request' into staging
# gpg: Signature made Thu 12 Oct 2017 21:52:28 BST
# gpg:                using RSA key 0xDAE8E10975969CE5
# gpg: Good signature from "Marc-André Lureau <marcandre.lureau@redhat.com>"
# gpg:                 aka "Marc-André Lureau <marcandre.lureau@gmail.com>"
# gpg: WARNING: This key is not certified with sufficiently trusted signatures!
# gpg:          It is not certain that the signature belongs to the owner.
# Primary key fingerprint: 87A9 BD93 3F87 C606 D276  F62D DAE8 E109 7596 9CE5

* remotes/elmarco/tags/vu-pull-request:
  libvhost-user: Support VHOST_USER_SET_SLAVE_REQ_FD
  libvhost-user: Update and fix feature and request lists
  vhost-user-bridge: Only process received packets on started queues
  libvhost-user: vu_queue_started

Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
Diffstat (limited to 'ui/sdl2-gl.c')
0 files changed, 0 insertions, 0 deletions