From: Peter Maydell Date: Thu, 16 Mar 2017 16:40:44 +0000 (+0000) Subject: Merge remote-tracking branch 'remotes/kraxel/tags/pull-cirrus-20170316-1' into staging X-Git-Url: http://git.maquefel.me/?a=commitdiff_plain;h=272d7dee5951f926fad1911f2f072e5915cdcba0;p=qemu.git 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) " # gpg: aka "Gerd Hoffmann " # gpg: aka "Gerd Hoffmann (private) " # 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 --- 272d7dee5951f926fad1911f2f072e5915cdcba0 diff --cc include/hw/compat.h index 90606f9fdb,b7e0e9f191..fc8c3e0600 --- a/include/hw/compat.h +++ b/include/hw/compat.h @@@ -18,22 -18,14 +18,30 @@@ .driver = "pci-bridge",\ .property = "shpc",\ .value = "on",\ + },{\ + .driver = TYPE_PCI_DEVICE,\ + .property = "x-pcie-extcap-init",\ + .value = "off",\ + },{\ + .driver = "virtio-pci",\ + .property = "x-pcie-deverr-init",\ + .value = "off",\ + },{\ + .driver = "virtio-pci",\ + .property = "x-pcie-lnkctl-init",\ + .value = "off",\ + },{\ + .driver = "virtio-pci",\ + .property = "x-pcie-pm-init",\ + .value = "off",\ + },{\ + .driver = "cirrus-vga",\ + .property = "vgamem_mb",\ + .value = "8",\ + },{\ + .driver = "isa-cirrus-vga",\ + .property = "vgamem_mb",\ + .value = "8",\ }, #define HW_COMPAT_2_7 \