From: Peter Maydell Date: Fri, 30 Sep 2016 22:45:56 +0000 (+0100) Subject: Merge remote-tracking branch 'remotes/borntraeger/tags/s390x-20160927' into staging X-Git-Url: http://git.maquefel.me/?a=commitdiff_plain;h=c5d128ffeb5357df1ea3e6de0c13b3d6a09f6064;p=qemu.git Merge remote-tracking branch 'remotes/borntraeger/tags/s390x-20160927' into staging Couple of s390x patches: - some PCI cleanups - fix build error due to uuid rework - fix potential deadlock in sigp handling - enable ccw devices in BIOS and enforce checking in QEMU # gpg: Signature made Wed 28 Sep 2016 12:27:03 BST # gpg: using RSA key 0x117BBC80B5A61C7C # gpg: Good signature from "Christian Borntraeger (IBM) " # Primary key fingerprint: F922 9381 A334 08F9 DBAB FBCA 117B BC80 B5A6 1C7C * remotes/borntraeger/tags/s390x-20160927: s390x/kvm: fix build against qemu_uuid s390x/css: {c,h,t,r,x}sch: require enable AND device number valid pc-bios/s390-ccw.img: rebuild image pc-bios/s390-ccw: enable subchannel for IPL I/O devices s390x/kvm: Fix potential deadlock in sigp handling s390x/pci: code cleanup s390x/pci: assign msix io region for each pci device s390x/pci: re-arrange variable declarations Signed-off-by: Peter Maydell --- c5d128ffeb5357df1ea3e6de0c13b3d6a09f6064