diff options
| author | Peter Maydell | 2019-07-03 23:57:56 +0200 |
|---|---|---|
| committer | Peter Maydell | 2019-07-03 23:57:56 +0200 |
| commit | f0577c616cde85f8bc06da2b2db705ca2fffae49 (patch) | |
| tree | a38e6cd56dbb716067c44348182b0146ce8f1b1e /Makefile | |
| parent | Merge remote-tracking branch 'remotes/amarkovic/tags/mips-queue-jul-02-2019' ... (diff) | |
| parent | Add ati vgabios to INSTALL_BLOBS. (diff) | |
| download | qemu-f0577c616cde85f8bc06da2b2db705ca2fffae49.tar.gz qemu-f0577c616cde85f8bc06da2b2db705ca2fffae49.tar.xz qemu-f0577c616cde85f8bc06da2b2db705ca2fffae49.zip | |
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>
Diffstat (limited to 'Makefile')
| -rw-r--r-- | Makefile | 2 |
1 files changed, 1 insertions, 1 deletions
@@ -750,7 +750,7 @@ bepo cz ifdef INSTALL_BLOBS BLOBS=bios.bin bios-256k.bin sgabios.bin vgabios.bin vgabios-cirrus.bin \ vgabios-stdvga.bin vgabios-vmware.bin vgabios-qxl.bin vgabios-virtio.bin \ -vgabios-ramfb.bin vgabios-bochs-display.bin \ +vgabios-ramfb.bin vgabios-bochs-display.bin vgabios-ati.bin \ ppc_rom.bin openbios-sparc32 openbios-sparc64 openbios-ppc QEMU,tcx.bin QEMU,cgthree.bin \ pxe-e1000.rom pxe-eepro100.rom pxe-ne2k_pci.rom \ pxe-pcnet.rom pxe-rtl8139.rom pxe-virtio.rom \ |