diff options
| author | Peter Maydell | 2017-01-24 18:26:26 +0100 |
|---|---|---|
| committer | Peter Maydell | 2017-01-24 18:26:26 +0100 |
| commit | a9e404600a9bd1e6a26431fc89e5069092e67f14 (patch) | |
| tree | 9efc96120cf48234fa44ed93341251251de90b72 /hw/core/null-machine.c | |
| parent | Merge remote-tracking branch 'remotes/ehabkost/tags/x86-and-machine-pull-requ... (diff) | |
| parent | s390x/kvm: fix cmma reset for KVM (diff) | |
| download | qemu-a9e404600a9bd1e6a26431fc89e5069092e67f14.tar.gz qemu-a9e404600a9bd1e6a26431fc89e5069092e67f14.tar.xz qemu-a9e404600a9bd1e6a26431fc89e5069092e67f14.zip | |
Merge remote-tracking branch 'remotes/cohuck/tags/s390x-20170124' into staging
Two s390x fixes: One for the kvm.c build failure, and one for a bug
that might cause random guest crashes with zeroed out pages on host
kernels with working cmma (< 4.6 and likely >= 4.10).
# gpg: Signature made Tue 24 Jan 2017 15:00:50 GMT
# gpg: using RSA key 0xDECF6B93C6F02FAF
# gpg: Good signature from "Cornelia Huck <huckc@linux.vnet.ibm.com>"
# gpg: aka "Cornelia Huck <cornelia.huck@de.ibm.com>"
# Primary key fingerprint: C3D0 D66D C362 4FF6 A8C0 18CE DECF 6B93 C6F0 2FAF
* remotes/cohuck/tags/s390x-20170124:
s390x/kvm: fix cmma reset for KVM
s390x/kvm: include hw_accel.h instead of kvm.h
Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
Diffstat (limited to 'hw/core/null-machine.c')
0 files changed, 0 insertions, 0 deletions