The following changes since commit 3c07587d49458341510360557c849e93e9afaf59:
Merge remote-tracking branch 'remotes/dgibson/tags/ppc-next-20151111' into staging (2015-11-11 09:34:18 +0000) are available in the git repository at: git://github.com/cohuck/qemu tags/s390x-20151111 for you to fetch changes up to 3c4c694c7ce2d21c0cf17a27cc60c91b6725ce48: s390: deprecate the non-ccw machine in 2.5 (2015-11-11 17:21:39 +0100) ---------------------------------------------------------------- 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. ---------------------------------------------------------------- Christian Borntraeger (1): s390: deprecate the non-ccw machine in 2.5 Cornelia Huck (4): s390x/css: sense data endianness MAINTAINERS: update s390 file patterns MAINTAINERS: update virtio-ccw/s390 git tree pc-bios/s390-ccw: rebuild image David Hildenbrand (3): qdev: provide qdev_reset_all_fn() s390x/ipl: clean up qom definitions and turn into TYPE_DEVICE s390x/ipl: switch error reporting to error_setg Dominik Dingel (2): s390x: switch to memory_region_allocate_system_memory s390x/kvm: don't enable CMMA when hugetlbfs will be used Maxim Samoylov (4): pc-bios/s390-ccw: Always adjust virtio sector count pc-bios/s390-ccw: ISO-9660 El Torito boot implementation pc-bios/s390-ccw: El Torito s390x boot entry check pc-bios/s390-ccw: El Torito 16-bit boot image size field workaround Yi Min Zhao (1): s390x/pci : fix up s390 pci iommu translation function MAINTAINERS | 20 +++-- hw/core/qdev.c | 5 ++ hw/s390x/css.c | 6 ++ hw/s390x/ipl.c | 68 ++++----------- hw/s390x/ipl.h | 25 ++++++ hw/s390x/s390-pci-bus.c | 8 +- hw/s390x/s390-virtio-ccw.c | 3 +- hw/s390x/s390-virtio.c | 16 ++-- include/hw/qdev-core.h | 1 + pc-bios/s390-ccw.img | Bin 13856 -> 17760 bytes pc-bios/s390-ccw/bootmap.c | 206 +++++++++++++++++++++++++++++++++++++++++++++ pc-bios/s390-ccw/bootmap.h | 206 +++++++++++++++++++++++++++++++++++++++++++++ pc-bios/s390-ccw/virtio.c | 7 ++ pc-bios/s390-ccw/virtio.h | 8 +- target-s390x/kvm.c | 4 +- 15 files changed, 506 insertions(+), 77 deletions(-) -- 2.6.3
