diff options
| author | Peter Maydell | 2015-12-01 17:30:27 +0100 |
|---|---|---|
| committer | Peter Maydell | 2015-12-01 17:30:27 +0100 |
| commit | e3d58827fe4efa8d40a78359350a185e238514e0 (patch) | |
| tree | 0da521ae13425630d48f0948a961f2884a423d3b /ui | |
| parent | Merge remote-tracking branch 'remotes/gkurz/tags/for-upstream' into staging (diff) | |
| parent | s390x/pci: fix up IOMMU size (diff) | |
| download | qemu-e3d58827fe4efa8d40a78359350a185e238514e0.tar.gz qemu-e3d58827fe4efa8d40a78359350a185e238514e0.tar.xz qemu-e3d58827fe4efa8d40a78359350a185e238514e0.zip | |
Merge remote-tracking branch 'remotes/cohuck/tags/s390x-20151201' into staging
Last round of s390x fixes for 2.5:
- The bios should be built for the first z machine, so that newer
instructions don't creep in.
- Silence annoying message when running make check.
- Fix a problem with the pci iommu exposed by recent changes.
# gpg: Signature made Tue 01 Dec 2015 08:59:42 GMT using RSA key ID C6F02FAF
# gpg: Good signature from "Cornelia Huck <huckc@linux.vnet.ibm.com>"
# gpg: aka "Cornelia Huck <cornelia.huck@de.ibm.com>"
* remotes/cohuck/tags/s390x-20151201:
s390x/pci: fix up IOMMU size
s390x: no deprecation warning while testing
pc-bios/s390-ccw: rebuild image
pc-bios/s390-ccw: build for z900
Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
Diffstat (limited to 'ui')
0 files changed, 0 insertions, 0 deletions