]> git.proxmox.com Git - mirror_qemu.git/commit
Merge remote-tracking branch 'remotes/cohuck-gitlab/tags/s390x-20210316' into staging
authorPeter Maydell <peter.maydell@linaro.org>
Wed, 17 Mar 2021 15:01:09 +0000 (15:01 +0000)
committerPeter Maydell <peter.maydell@linaro.org>
Wed, 17 Mar 2021 15:01:09 +0000 (15:01 +0000)
commit569a9481034b43f650dbb82dd7820beb0051508e
tree9fda2cbc5c365b189702dccd43e2a28097fba466
parent25a77510432813c3ee9b80f56b8470a52f00c884
parent5793f5aafb05dae30e9dcb57d0d1c8f1a9633f6d
Merge remote-tracking branch 'remotes/cohuck-gitlab/tags/s390x-20210316' into staging

s390x updates:
- get rid of legacy_s390_alloc() and phys_mem_set_alloc()
- tcg: implement the MVPG condition-code-option bit
- fix g_autofree variable handing in the pci vfio code
- use official z15 names in the cpu model definitions

# gpg: Signature made Tue 16 Mar 2021 10:04:21 GMT
# gpg:                using RSA key C3D0D66DC3624FF6A8C018CEDECF6B93C6F02FAF
# gpg:                issuer "cohuck@redhat.com"
# gpg: Good signature from "Cornelia Huck <conny@cornelia-huck.de>" [unknown]
# gpg:                 aka "Cornelia Huck <huckc@linux.vnet.ibm.com>" [full]
# gpg:                 aka "Cornelia Huck <cornelia.huck@de.ibm.com>" [full]
# gpg:                 aka "Cornelia Huck <cohuck@kernel.org>" [unknown]
# gpg:                 aka "Cornelia Huck <cohuck@redhat.com>" [unknown]
# Primary key fingerprint: C3D0 D66D C362 4FF6 A8C0  18CE DECF 6B93 C6F0 2FAF

* remotes/cohuck-gitlab/tags/s390x-20210316:
  s390x/pci: Add missing initialization for g_autofree variables
  target/s390x: Store r1/r2 for page-translation exceptions during MVPG
  target/s390x: Implement the MVPG condition-code-option bit
  s390x/cpu_model: use official name for 8562
  exec: Get rid of phys_mem_set_alloc()
  s390x/kvm: Get rid of legacy_s390_alloc()

Signed-off-by: Peter Maydell <peter.maydell@linaro.org>