Merge remote-tracking branch 'remotes/kraxel/tags/vga-20190703-pull-request' into...
commitf0577c616cde85f8bc06da2b2db705ca2fffae49
authorPeter Maydell <peter.maydell@linaro.org>
Wed, 3 Jul 2019 21:57:56 +0000 (3 22:57 +0100)
committerPeter Maydell <peter.maydell@linaro.org>
Wed, 3 Jul 2019 21:57:56 +0000 (3 22:57 +0100)
treea38e6cd56dbb716067c44348182b0146ce8f1b1e
parentc204e342e861c83143c150ec9e7430bef29eebe4
parent0a87fd693d4e955a6877a2166b65bb7b7192aaaa
Merge remote-tracking branch 'remotes/kraxel/tags/vga-20190703-pull-request' into staging

vga: virtio fixes, bitbang i2c asan fix, install ati vgabios.

# gpg: Signature made Wed 03 Jul 2019 09:53:44 BST
# gpg:                using RSA key 4CB6D8EED3E87138
# 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/vga-20190703-pull-request:
  Add ati vgabios to INSTALL_BLOBS.
  hw/i2c/bitbang_i2c: Use in-place rather than malloc'd bitbang_i2c_interface struct
  virtio-gpu: check if the resource already exists in virtio_gpu_load()
  virtio-gpu: fix unmap in error path

Signed-off-by: Peter Maydell <peter.maydell@linaro.org>