summary refs log tree commit diff stats
path: root/qobject/json-lexer.c
diff options
context:
space:
mode:
authorPeter Maydell <peter.maydell@linaro.org>2018-09-24 16:15:26 +0100
committerPeter Maydell <peter.maydell@linaro.org>2018-09-24 16:15:26 +0100
commitd5a515738ee2dec0cdf11d8a14a09abae6c20571 (patch)
treeafe4cf0ecca0989ce975668252a0eca95c3bed8d /qobject/json-lexer.c
parentefd1d5229fbf09f2ef535df024ccaa620a013f86 (diff)
parent8da132a56f7ebaabc5b674b5a3a2e6fa8934be45 (diff)
downloadfocaccia-qemu-d5a515738ee2dec0cdf11d8a14a09abae6c20571.tar.gz
focaccia-qemu-d5a515738ee2dec0cdf11d8a14a09abae6c20571.zip
Merge remote-tracking branch 'remotes/kraxel/tags/vga-20180903-pull-request' into staging
vga: virtio reset fix, virtio iommu support.

# gpg: Signature made Mon 03 Sep 2018 07:57:32 BST
# gpg:                using RSA key 4CB6D8EED3E87138
# 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/vga-20180903-pull-request:
  virtio-gpu: add iommu support
  virtio-gpu: pass down VirtIOGPU pointer to a bunch of functions
  use dpy_gfx_update_full
  Revert "virtio-gpu: fix crashes upon warm reboot with vga mode"
  virtio-vga: fix reset

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