diff options
| author | Peter Maydell <peter.maydell@linaro.org> | 2019-02-05 17:39:15 +0000 |
|---|---|---|
| committer | Peter Maydell <peter.maydell@linaro.org> | 2019-02-05 17:39:15 +0000 |
| commit | 9669c9756205290a7a357ff1515a4ca30d852b05 (patch) | |
| tree | 3f7f7253b440e234d12069b105a9c8c3fc241af7 /qemu-edid.c | |
| parent | 68df0c30edf0b9766a2364cbf12328db3d7284e8 (diff) | |
| parent | 2313a88fe68cb970532ba1641ffc35c848daae86 (diff) | |
Merge remote-tracking branch 'remotes/cohuck/tags/s390x-20190205' into staging
Fixes and improvements in tcg and the zPCI code.
# gpg: Signature made Tue 05 Feb 2019 16:36:09 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/tags/s390x-20190205:
s390x/pci: Unplug remaining requested devices on pcihost reset
s390x/pci: Warn when adding PCI devices without the 'zpci' feature
s390x/pci: Fix hotplugging of PCI bridges
s390x/pci: Fix primary bus number for PCI bridges
s390x/tcg: Don't model FP registers as globals
s390x/pci: mark zpci devices as unmigratable
s390x/pci: Drop release timer and replace it with a flag
s390x/pci: Introduce unplug requests and split unplug handler
s390x: remove direct reference to mem_path global from s390x code
target/s390x: define TCG_GUEST_DEFAULT_MO for MTTCG
Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
Diffstat (limited to 'qemu-edid.c')
0 files changed, 0 insertions, 0 deletions