diff options
author | Peter Maydell | 2018-08-21 10:24:19 +0200 |
---|---|---|
committer | Peter Maydell | 2018-08-21 10:24:19 +0200 |
commit | 90b9508e211360f243a32474d67a4d49edb80d6a (patch) | |
tree | ac010743c29fdac5443f1bf129613f026955a5e3 /hw/vfio/common.c | |
parent | Merge remote-tracking branch 'remotes/cohuck/tags/s390x-20180820' into staging (diff) | |
parent | sun4m: don't use legacy fw_cfg_init_mem() function (diff) | |
download | qemu-90b9508e211360f243a32474d67a4d49edb80d6a.tar.gz qemu-90b9508e211360f243a32474d67a4d49edb80d6a.tar.xz qemu-90b9508e211360f243a32474d67a4d49edb80d6a.zip |
Merge remote-tracking branch 'remotes/mcayland/tags/qemu-sparc.for-upstream-20180820' into staging
qemu-sparc.for-upstream queue
# gpg: Signature made Mon 20 Aug 2018 19:38:04 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.for-upstream-20180820:
sun4m: don't use legacy fw_cfg_init_mem() function
sun4u: ensure kernel_top is always initialised
Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
Diffstat (limited to 'hw/vfio/common.c')
0 files changed, 0 insertions, 0 deletions