diff options
| author | Peter Maydell <peter.maydell@linaro.org> | 2016-01-14 12:42:08 +0000 |
|---|---|---|
| committer | Peter Maydell <peter.maydell@linaro.org> | 2016-01-14 12:42:08 +0000 |
| commit | cd0b19a20b80ccacd0579d83ac29ea36d666e67c (patch) | |
| tree | c62e5191a0702123eb13c8c5106f144dacce46c7 /block/linux-aio.c | |
| parent | ed56fdb25692920d2e2915b9c979ad477b0c018e (diff) | |
| parent | 88bfa2166ac0b14483a2a2c667499bf3617aebf0 (diff) | |
| download | qemu-cd0b19a20b80ccacd0579d83ac29ea36d666e67c.zip | |
Merge remote-tracking branch 'remotes/cohuck/tags/s390x-20160113' into staging
This first round of s390x patches includes:
- new compat machine
- remove the old s390-virtio machine
- fixes and some cleanup
# gpg: Signature made Wed 13 Jan 2016 14:55:55 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-20160113:
s390x/pci: return real state during listing PCI
virtio-ccw: fix sanity check for vector
s390: Introduce CCW_COMPAT_2_5
s390x/virtio: use qemu_check_nic_model()
s390x/pci: code cleanup
s390x/pci: reject some operations to disabled PCI function
s390x: remove s390-virtio devices
s390x: remove s390-virtio machine
s390x: add 2.6 compat machine
Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
Diffstat (limited to 'block/linux-aio.c')
0 files changed, 0 insertions, 0 deletions