From: Peter Maydell Date: Mon, 30 Oct 2017 13:02:45 +0000 (+0000) Subject: Merge remote-tracking branch 'remotes/borntraeger/tags/s390x-20171030' into staging X-Git-Url: http://git.maquefel.me/?a=commitdiff_plain;h=abf6e752e55b2f5afb48303429dea2db7c3a62de;p=qemu.git 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) " # 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 --- abf6e752e55b2f5afb48303429dea2db7c3a62de