From: Peter Maydell Date: Fri, 20 Jan 2017 15:53:58 +0000 (+0000) Subject: Merge remote-tracking branch 'remotes/cohuck/tags/s390x-20170120-v2' into staging X-Git-Url: http://git.maquefel.me/?a=commitdiff_plain;h=d1c82f7cc34443841095f490345f86c9d8baca34;p=qemu.git Merge remote-tracking branch 'remotes/cohuck/tags/s390x-20170120-v2' into staging First set of s390x patches for 2.9: - rework of the zpci code, giving us proper multibus support - introduction of the 2.9 machine - fixes and improvements # gpg: Signature made Fri 20 Jan 2017 09:11:58 GMT # gpg: using RSA key 0xDECF6B93C6F02FAF # gpg: Good signature from "Cornelia Huck " # gpg: aka "Cornelia Huck " # Primary key fingerprint: C3D0 D66D C362 4FF6 A8C0 18CE DECF 6B93 C6F0 2FAF * remotes/cohuck/tags/s390x-20170120-v2: virtio-ccw: fix ring sizing s390x/pci: merge msix init functions s390x/pci: handle PCIBridge bus number s390x/pci: use hashtable to look up zpci via fh s390x/pci: PCI multibus bridge handling s390x/pci: optimize calling s390_get_phb() s390x/pci: change the device array to a list s390x/pci: dynamically allocate iommu s390x/pci: make S390PCIIOMMU inherit Object s390x/kvm: use kvm_gsi_routing_enabled in flic s390x: add compat machine for 2.9 s390x: remove double compat statement Signed-off-by: Peter Maydell --- d1c82f7cc34443841095f490345f86c9d8baca34