Merge remote-tracking branch 'remotes/kraxel/tags/vga-20190524-pull-request' into...
commit40575757e1ef9fa8e34c2320fb56a7dffd92efcc
authorPeter Maydell <peter.maydell@linaro.org>
Fri, 24 May 2019 11:09:23 +0000 (24 12:09 +0100)
committerPeter Maydell <peter.maydell@linaro.org>
Fri, 24 May 2019 11:09:23 +0000 (24 12:09 +0100)
tree61c0f8af9a81637f914be3e38768a2b8d7e4113f
parent636011255dec55da4cac28240ffcaa2e740f1e81
parentf79081b4b71b72640bedd40a7cd76f864c8287f1
Merge remote-tracking branch 'remotes/kraxel/tags/vga-20190524-pull-request' into staging

ramfb: misc improvements.

# gpg: Signature made Fri 24 May 2019 09:56:59 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-20190524-pull-request:
  hw/display/ramfb: initialize fw-config space with xres/ yres
  hw/display/ramfb: lock guest resolution after it's set
  hw/display/ramfb: fix guest memory un-mapping

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