Merge remote-tracking branch 'remotes/mcayland/tags/qemu-sparc-20190206' into staging
commitd55451dcdee0704f6a756d4ec95be31515751235
authorPeter Maydell <peter.maydell@linaro.org>
Thu, 7 Feb 2019 16:49:30 +0000 (7 16:49 +0000)
committerPeter Maydell <peter.maydell@linaro.org>
Thu, 7 Feb 2019 16:49:30 +0000 (7 16:49 +0000)
tree9ba72140bcf645ace7f8b308a96f254b332ba3de
parent4f0444fc6807d08620ac8eea7d7043d3d2a6ae6a
parent6031ff8b0ad0feee58cd46ebb0c8d2a6a48d616e
Merge remote-tracking branch 'remotes/mcayland/tags/qemu-sparc-20190206' into staging

qemu-sparc queue

# gpg: Signature made Wed 06 Feb 2019 21:25:18 GMT
# gpg:                using RSA key CC621AB98E82200D915CC9C45BC2C56FAE0F321F
# gpg:                issuer "mark.cave-ayland@ilande.co.uk"
# gpg: Good signature from "Mark Cave-Ayland <mark.cave-ayland@ilande.co.uk>" [full]
# Primary key fingerprint: CC62 1AB9 8E82 200D 915C  C9C4 5BC2 C56F AE0F 321F

* remotes/mcayland/tags/qemu-sparc-20190206:
  sun4m: pass initrd size to OpenBIOS via fw_cfg interface
  sun4u: add power_mem_read routine
  hw/sparc64: Create VGA device only if it has really been requested

Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
hw/sparc/sun4m.c
hw/sparc64/sun4u.c