summary refs log tree commit diff stats
path: root/scripts/qemu.py
diff options
context:
space:
mode:
authorPeter Maydell <peter.maydell@linaro.org>2017-03-16 16:40:44 +0000
committerPeter Maydell <peter.maydell@linaro.org>2017-03-16 16:40:44 +0000
commit272d7dee5951f926fad1911f2f072e5915cdcba0 (patch)
tree9ddad371f1075b8ac96b8f5eb4f9c019e72f6ac2 /scripts/qemu.py
parentc5e737e5fbb8e48f9371764cc156ed15f4047a00 (diff)
parentffaf857778286ca54e3804432a2369a279e73aa7 (diff)
downloadfocaccia-qemu-272d7dee5951f926fad1911f2f072e5915cdcba0.tar.gz
focaccia-qemu-272d7dee5951f926fad1911f2f072e5915cdcba0.zip
Merge remote-tracking branch 'remotes/kraxel/tags/pull-cirrus-20170316-1' into staging
cirrus: blitter fixes.

# gpg: Signature made Thu 16 Mar 2017 09:05:22 GMT
# gpg:                using RSA key 0x4CB6D8EED3E87138
# 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/pull-cirrus-20170316-1:
  cirrus: stop passing around src pointers in the blitter
  cirrus: stop passing around dst pointers in the blitter
  cirrus: fix cirrus_invalidate_region
  cirrus: add option to disable blitter
  cirrus: switch to 4 MB video memory by default
  cirrus/vnc: zap bitblit support from console code.
  fix :cirrus_vga fix OOB read case qemu Segmentation fault

# Conflicts:
#	include/hw/compat.h

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