From: Peter Maydell <peter.maydell@linaro.org>
Date: Tue, 21 Aug 2018 14:57:56 +0000 (+0100)
Subject: Merge remote-tracking branch 'remotes/kraxel/tags/vga-20180821-pull-request' into... 
X-Git-Tag: v3.1.0-rc0~123
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=13b7b188501d419a7d63c016e00065bcc693b7d4;p=thirdparty%2Fqemu.git

Merge remote-tracking branch 'remotes/kraxel/tags/vga-20180821-pull-request' into staging

hw/display: misc fixes

# gpg: Signature made Tue 21 Aug 2018 09:16:01 BST
# gpg:                using RSA key 4CB6D8EED3E87138
# 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/vga-20180821-pull-request:
  hw/pci-host/bonito: Move away from old_mmio accessors
  hw/display/vga-isa-mm: Convert away from old_mmio
  qxl: drop unused generation variable
  hw/display/ramfb: Compile the ramfb code only when CONFIG_FW_CFG_DMA is set

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

13b7b188501d419a7d63c016e00065bcc693b7d4