diff options
| author | Peter Maydell <peter.maydell@linaro.org> | 2018-07-02 14:57:43 +0100 |
|---|---|---|
| committer | Peter Maydell <peter.maydell@linaro.org> | 2018-07-02 14:57:43 +0100 |
| commit | 7320bb2cb0b0bc54ecab3dfaea797d8f42e34ad9 (patch) | |
| tree | 45860d60d5072a356dcf225a9d3796b31cd288a9 /qemu.nsi | |
| parent | 2d58e33ec1b76990f09bc1e3412e0b36e1ac4634 (diff) | |
| parent | 30c8db0e219a3c1d8b39c19e8b858830cb141738 (diff) | |
| download | qemu-7320bb2cb0b0bc54ecab3dfaea797d8f42e34ad9.zip qemu-7320bb2cb0b0bc54ecab3dfaea797d8f42e34ad9.tar.gz qemu-7320bb2cb0b0bc54ecab3dfaea797d8f42e34ad9.tar.bz2 | |
Merge remote-tracking branch 'remotes/cohuck/tags/s390x-20180702' into staging
s390x updates:
- add bpb/ppa15 features to default cpu model for z196 and later
- rework TOD handling and fix cpu hotplug under tcg
- various fixes
# gpg: Signature made Mon 02 Jul 2018 12:09:40 BST
# gpg: using RSA key DECF6B93C6F02FAF
# 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-20180702:
s390x/tcg: fix locking problem with tcg_s390_tod_updated
s390x/kvm: indicate alignment in legacy_s390_alloc()
s390x/kvm: legacy_s390_alloc() only supports one allocation
s390x/tcg: fix CPU hotplug with single-threaded TCG
s390x/tcg: rearm the CKC timer during migration
s390x/tcg: implement SET CLOCK
s390x/tcg: SET CLOCK COMPARATOR can clear CKC interrupts
s390x/tcg: properly implement the TOD
s390x/tcg: drop tod_basetime
s390x/tod: factor out TOD into separate device
s390x/kvm: pass values instead of pointers to kvm_s390_set_clock_*()
s390x/tcg: avoid overflows in time2tod/tod2time
s390x/cpumodel: default enable bpb and ppa15 for z196 and later
loader: Check access size when calling rom_ptr() to avoid crashes
s390/ipl: fix ipl with -no-reboot
Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
Diffstat (limited to 'qemu.nsi')
0 files changed, 0 insertions, 0 deletions