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>

diff --cc include/hw/compat.h
index 90606f9fdbcc2614f54ee6f758068b0bec06d07d,b7e0e9f191f81631e68bc7538bba7a025984a7cd..fc8c3e060007592f3c6d08e9a0db445ba0777af4
--- 1/include/hw/compat.h
--- 2/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 \