diff options
author | Peter Maydell <peter.maydell@linaro.org> | 2017-06-15 13:45:15 +0100 |
---|---|---|
committer | Peter Maydell <peter.maydell@linaro.org> | 2017-06-15 13:45:15 +0100 |
commit | edf8bc98424d62035d5e4c0f39542722d72d7979 (patch) | |
tree | 44ee0a0671c9f488290897947895a567cd330d4c /qom/object.c | |
parent | 73aa4692ec00d479dd1732b40c068d78d3eb909c (diff) | |
parent | 076d4d39b65f50ca1bba3d3c8a8f1cf977c1c3f0 (diff) | |
download | qemu-edf8bc98424d62035d5e4c0f39542722d72d7979.zip qemu-edf8bc98424d62035d5e4c0f39542722d72d7979.tar.gz qemu-edf8bc98424d62035d5e4c0f39542722d72d7979.tar.bz2 |
Merge remote-tracking branch 'remotes/rth/tags/pull-s390-20170613' into staging
Queued s390 patches
# gpg: Signature made Tue 13 Jun 2017 21:22:41 BST
# gpg: using RSA key 0xAD1270CC4DD0279B
# gpg: Good signature from "Richard Henderson <rth7680@gmail.com>"
# gpg: aka "Richard Henderson <rth@redhat.com>"
# gpg: aka "Richard Henderson <rth@twiddle.net>"
# Primary key fingerprint: 9CB1 8DDA F8E8 49AD 2AFC 16A4 AD12 70CC 4DD0 279B
* remotes/rth/tags/pull-s390-20170613:
s390x/cpumodel: wire up cpu type + id for TCG
target/s390x: rework PGM interrupt psw.addr handling
target/s390x: correctly indicate PER nullification
Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
Diffstat (limited to 'qom/object.c')
0 files changed, 0 insertions, 0 deletions