]> git.proxmox.com Git - mirror_qemu.git/commit
Merge remote-tracking branch 'remotes/mcayland/tags/qemu-sparc-20180618' into staging
authorPeter Maydell <peter.maydell@linaro.org>
Tue, 19 Jun 2018 16:42:50 +0000 (17:42 +0100)
committerPeter Maydell <peter.maydell@linaro.org>
Tue, 19 Jun 2018 16:42:50 +0000 (17:42 +0100)
commit79449bc311070658122cd54534cd95c1296d94a6
tree49968ef5d30fa07df97263ad9853d5d20c9be3bb
parent727f8d87aaf8588fd6510ce310e61f757d3e7c46
parent46bb0137b8266ab8dedc3b9712f3d246bbd686ba
Merge remote-tracking branch 'remotes/mcayland/tags/qemu-sparc-20180618' into staging

qemu-sparc queue

# gpg: Signature made Mon 18 Jun 2018 18:43:24 BST
# gpg:                using RSA key 5BC2C56FAE0F321F
# gpg: Good signature from "Mark Cave-Ayland <mark.cave-ayland@ilande.co.uk>"
# Primary key fingerprint: CC62 1AB9 8E82 200D 915C  C9C4 5BC2 C56F AE0F 321F

* remotes/mcayland/tags/qemu-sparc-20180618:
  SPARC64: add icount support
  hw/sparc/sun4m: Fix problems with device introspection
  hw/sparc64/sun4u: Fix introspection by converting prom instance_init to realize

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