diff options
author | 2017-11-20 18:48:48 +0000 | |
---|---|---|
committer | 2017-11-20 18:48:48 +0000 | |
commit | 3da87f771311199e9b915163315ba0e9b96c6d1b (patch) | |
tree | 76bf173b23e9ac40d7ddfaaa5699ffc3eadfd86c /hw/misc/omap_clk.c | |
parent | Merge remote-tracking branch 'remotes/dgibson/tags/ppc-for-2.11-20171120' into staging (diff) | |
parent | pc-bios/s390-ccw.img: update image (diff) | |
download | qemu-3da87f771311199e9b915163315ba0e9b96c6d1b.tar.xz qemu-3da87f771311199e9b915163315ba0e9b96c6d1b.zip |
Merge remote-tracking branch 'remotes/cohuck/tags/s390x-20171120-v1' into staging
Fix storing cpu status (both kvm and tcg), locking around diag 308
(tcg only) and a non-zero variable in the s390-ccw bios.
# gpg: Signature made Mon 20 Nov 2017 15:18:05 GMT
# gpg: using RSA key 0xDECF6B93C6F02FAF
# gpg: Good signature from "Cornelia Huck <conny@cornelia-huck.de>"
# gpg: aka "Cornelia Huck <huckc@linux.vnet.ibm.com>"
# gpg: aka "Cornelia Huck <cornelia.huck@de.ibm.com>"
# gpg: aka "Cornelia Huck <cohuck@kernel.org>"
# gpg: aka "Cornelia Huck <cohuck@redhat.com>"
# Primary key fingerprint: C3D0 D66D C362 4FF6 A8C0 18CE DECF 6B93 C6F0 2FAF
* remotes/cohuck/tags/s390x-20171120-v1:
pc-bios/s390-ccw.img: update image
pc-bios/s390-ccw: Fix problem with invalid virtio-scsi LUN when rebooting
s390x/tcg: fix DIAG 308 with > 1 VCPU (MTTCG)
s390x: fix storing CPU status (again)
Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
Diffstat (limited to 'hw/misc/omap_clk.c')
0 files changed, 0 insertions, 0 deletions