diff options
| author | Peter Maydell <peter.maydell@linaro.org> | 2015-11-11 18:23:08 +0000 |
|---|---|---|
| committer | Peter Maydell <peter.maydell@linaro.org> | 2015-11-11 18:23:08 +0000 |
| commit | 31e49ac192f782d594bbd04070fe79e800b7813f (patch) | |
| tree | ecc84433ba0e7cce3acd4a74cdff452739e883d7 /slirp/ip_output.c | |
| parent | 2869653f23c63c400d3791513b507e9feddbc751 (diff) | |
| parent | 3c4c694c7ce2d21c0cf17a27cc60c91b6725ce48 (diff) | |
| download | qemu-31e49ac192f782d594bbd04070fe79e800b7813f.zip qemu-31e49ac192f782d594bbd04070fe79e800b7813f.tar.gz qemu-31e49ac192f782d594bbd04070fe79e800b7813f.tar.bz2 | |
Merge remote-tracking branch 'remotes/cohuck/tags/s390x-20151111' into staging
Hopefully last big batch of s390x patches, including:
- bugfixes for LE host and for pci translation
- MAINTAINERS update
- hugetlbfs enablement (kernel patches pending)
- boot from El Torito iso images on virtio-blk
(boot from scsi pending)
- cleanup in the ipl device code
There's also a helper function for resetting busless devices in the
qdev core in there.
# gpg: Signature made Wed 11 Nov 2015 17:49:58 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-20151111:
s390: deprecate the non-ccw machine in 2.5
s390x/ipl: switch error reporting to error_setg
s390x/ipl: clean up qom definitions and turn into TYPE_DEVICE
qdev: provide qdev_reset_all_fn()
pc-bios/s390-ccw: rebuild image
pc-bios/s390-ccw: El Torito 16-bit boot image size field workaround
pc-bios/s390-ccw: El Torito s390x boot entry check
pc-bios/s390-ccw: ISO-9660 El Torito boot implementation
pc-bios/s390-ccw: Always adjust virtio sector count
s390x/kvm: don't enable CMMA when hugetlbfs will be used
s390x: switch to memory_region_allocate_system_memory
MAINTAINERS: update virtio-ccw/s390 git tree
MAINTAINERS: update s390 file patterns
s390x/pci : fix up s390 pci iommu translation function
s390x/css: sense data endianness
Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
Diffstat (limited to 'slirp/ip_output.c')
0 files changed, 0 insertions, 0 deletions