diff options
| author | Peter Maydell <peter.maydell@linaro.org> | 2017-10-30 13:02:45 +0000 |
|---|---|---|
| committer | Peter Maydell <peter.maydell@linaro.org> | 2017-10-30 13:02:45 +0000 |
| commit | abf6e752e55b2f5afb48303429dea2db7c3a62de (patch) | |
| tree | 7b3e5988befbe144847239291fdd8104bdd06008 /nbd/client.c | |
| parent | 21dab18b53f37664c2046c5bba91b416705ccdf1 (diff) | |
| parent | 7a4ec18d117d74eedccdadca882331b928135465 (diff) | |
| download | qemu-abf6e752e55b2f5afb48303429dea2db7c3a62de.tar.gz | |
Merge remote-tracking branch 'remotes/borntraeger/tags/s390x-20171030' into staging
s390x: fixups for 2.11
- missing \r in the BIOS console output
- CPU type name is now "s390x-cpu"
- fixup for the host-model on z14 and older machine versions
# gpg: Signature made Mon 30 Oct 2017 08:34:15 GMT
# gpg: using RSA key 0x117BBC80B5A61C7C
# gpg: Good signature from "Christian Borntraeger (IBM) <borntraeger@de.ibm.com>"
# Primary key fingerprint: F922 9381 A334 08F9 DBAB FBCA 117B BC80 B5A6 1C7C
* remotes/borntraeger/tags/s390x-20171030:
s390-*.img: update s390 bios with latest fixes
s390-ccw: print carriage return with new lines
s390x/kvm: use cpu model for gscb on compat machines
target/s390x: change CPU type name to "s390x-cpu"
Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
Diffstat (limited to 'nbd/client.c')
0 files changed, 0 insertions, 0 deletions