The following changes since commit 4f4a9ca4a4386c137301b3662faba076455ff15a:
Merge remote-tracking branch 'remotes/pmaydell/tags/pull-target-arm-20160707' into staging (2016-07-07 14:49:38 +0100) are available in the git repository at: git://github.com/cohuck/qemu tags/s390x-20160711 for you to fetch changes up to 93d16d81c8af0fe93a04bee8a4cb3259f480cab6: s390x/pci: make hot-unplug handler smoother (2016-07-11 09:48:05 +0200) ---------------------------------------------------------------- Last round of s390x patches for 2.7: - A large update of the s390x PCI code, bringing it in line with the architecture - Fixes and improvements in the ipl (boot) code - Refactoring in the css code ---------------------------------------------------------------- Alexander Yarygin (1): s390x/ipl: Support IPL from selected SCSI device Cornelia Huck (1): pc-bios/s390-ccw.img: rebuild image David Hildenbrand (1): s390x/ipl: fix reboots for migration from different bios Eugene (jno) Dvurechenski (1): pc-bios/s390-ccw: Pass selected SCSI device to IPL Jing Liu (2): s390x/css: Factor out virtual css bridge and bus s390x/css: Unplug handler of virtual css bridge Sascha Silbe (2): s390x/css: factor out some generic code from virtio_ccw_device_realize() s390x/css: use define for "virtual-css-bridge" literal Yi Min Zhao (17): s390x/pci: fix failures of dma map/unmap s390x/pci: acceleration for getting S390pciState s390x/pci: write fid in CLP_QUERY_PCI_FN s390x/pci: unify FH_ macros s390x/pci: refactor s390_pci_find_dev_by_fh s390x/pci: enforce zPCI state checking s390x/pci: introduce S390PCIBus s390x/pci: introduce S390PCIIOMMU s390x/pci: introduce S390PCIBusDevice qdev s390x/pci: enable uid-checking s390x/pci: enable zpci hot-plug/hot-unplug s390x/pci: add checkings in CLP_SET_PCI_FN s390x/pci: refactor s390_pci_find_dev_by_idx s390x/pci: refactor list_pci s390x/pci: fix stpcifc_service_call s390x/pci: replace fid with idx in msg data of msix s390x/pci: make hot-unplug handler smoother hw/s390x/Makefile.objs | 2 + hw/s390x/ccw-device.c | 27 ++ hw/s390x/ccw-device.h | 43 +++ hw/s390x/css-bridge.c | 124 +++++++++ hw/s390x/css.c | 143 ++++++++++ hw/s390x/ipl.c | 37 ++- hw/s390x/ipl.h | 15 ++ hw/s390x/s390-pci-bus.c | 579 +++++++++++++++++++++++++++++++---------- hw/s390x/s390-pci-bus.h | 77 +++++- hw/s390x/s390-pci-inst.c | 266 ++++++++++++++----- hw/s390x/s390-pci-inst.h | 7 +- hw/s390x/s390-virtio-ccw.c | 3 +- hw/s390x/virtio-ccw.c | 271 ++++--------------- hw/s390x/virtio-ccw.h | 20 +- include/hw/s390x/css-bridge.h | 31 +++ include/hw/s390x/css.h | 18 ++ include/hw/s390x/sclp.h | 1 + pc-bios/s390-ccw.img | Bin 26424 -> 26440 bytes pc-bios/s390-ccw/iplb.h | 12 + pc-bios/s390-ccw/main.c | 12 + pc-bios/s390-ccw/virtio-scsi.c | 11 + pc-bios/s390-ccw/virtio.h | 2 + target-s390x/kvm.c | 4 +- 23 files changed, 1249 insertions(+), 456 deletions(-) create mode 100644 hw/s390x/ccw-device.c create mode 100644 hw/s390x/ccw-device.h create mode 100644 hw/s390x/css-bridge.c create mode 100644 include/hw/s390x/css-bridge.h -- 2.9.0