summary refs log tree commit diff stats
path: root/include/qemu-common.h
diff options
context:
space:
mode:
authorPeter Maydell <peter.maydell@linaro.org>2018-10-15 15:03:45 +0100
committerPeter Maydell <peter.maydell@linaro.org>2018-10-15 15:03:45 +0100
commitff56877e911782dedc9a424233fd3f62369c258c (patch)
tree7b613ed6f36bb4a50bf1b01743348d59d0899fdf /include/qemu-common.h
parent046936ed7179cfa413dfb2668b03d7e684bb7dbd (diff)
parent9f42e0b3c2355c4a2475124c3fc40421a88de813 (diff)
downloadfocaccia-qemu-ff56877e911782dedc9a424233fd3f62369c258c.tar.gz
focaccia-qemu-ff56877e911782dedc9a424233fd3f62369c258c.zip
Merge remote-tracking branch 'remotes/kraxel/tags/vga-20181015-pull-request' into staging
vga: config tweaks, edid updates, qxl bugfix, install new vgabios blobs.

# gpg: Signature made Mon 15 Oct 2018 10:05:03 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-20181015-pull-request:
  Makefile: Install new vgabios binaries
  hw/display/cirrus_vga: Move "isa-cirrus-vga" device into a separate file
  i2c: switch ddc to use the new edid generator
  qxl: check qxl_phys2virt return value
  bochs-display: wire up edid support
  display: add separate config option for bochs-display
  edid: fix alignment issues

Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
Diffstat (limited to 'include/qemu-common.h')
0 files changed, 0 insertions, 0 deletions