summary refs log tree commit diff stats
path: root/scripts/qapi/common.py
diff options
context:
space:
mode:
authorPeter Maydell <peter.maydell@linaro.org>2019-09-23 11:42:05 +0100
committerPeter Maydell <peter.maydell@linaro.org>2019-09-23 11:42:05 +0100
commit8400efa51aa0a7908d7edb8ac6135e2fe69b4b37 (patch)
tree53ee24e9e80c0ef3e418bb895919ee2f8edd6c8a /scripts/qapi/common.py
parente446ed5a29d1a39b257bd78fc193ab8a69ec81c2 (diff)
parent7505deca0bfa859136ec6419dbafc504f22fcac2 (diff)
downloadfocaccia-qemu-8400efa51aa0a7908d7edb8ac6135e2fe69b4b37.tar.gz
focaccia-qemu-8400efa51aa0a7908d7edb8ac6135e2fe69b4b37.zip
Merge remote-tracking branch 'remotes/borntraeger/tags/s390x-20190923' into staging
- bugfixes in ccw bios
- gen15a is called z15
- officially require a 3.15 kernel or later for kvm

# gpg: Signature made Mon 23 Sep 2019 08:18:32 BST
# gpg:                using RSA key 117BBC80B5A61C7C
# gpg: Good signature from "Christian Borntraeger (IBM) <borntraeger@de.ibm.com>" [full]
# Primary key fingerprint: F922 9381 A334 08F9 DBAB  FBCA 117B BC80 B5A6 1C7C

* remotes/borntraeger/tags/s390x-20190923:
  s390x/cpumodel: Add the z15 name to the description of gen15a
  s390x/kvm: Officially require at least kernel 3.15
  pc-bios/s390-ccw: Rebuild the s390-netboot.img firmware image
  pc-bios/s390-ccw/net: fix a possible memory leak in get_uuid()
  pc-bios/s390-ccw: Do not pre-initialize empty array

Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
Diffstat (limited to 'scripts/qapi/common.py')
0 files changed, 0 insertions, 0 deletions