From: Peter Maydell Date: Mon, 16 Mar 2015 11:44:55 +0000 (+0000) Subject: Merge remote-tracking branch 'remotes/cohuck/tags/s390x-20150316' into staging X-Git-Url: http://git.maquefel.me/?a=commitdiff_plain;h=2dfe7d07e2f40adb18a0b0cd286f3d327692d0fc;p=qemu.git Merge remote-tracking branch 'remotes/cohuck/tags/s390x-20150316' into staging Final batch of s390x enhancements/fixes for 2.3: - handle TOD clock during migration - CPACF key wrap options - limit amount of pci device code we build - ensure big endian accesses for ccws - various fixes and cleanups # gpg: Signature made Mon Mar 16 10:01:44 2015 GMT using RSA key ID C6F02FAF # gpg: Good signature from "Cornelia Huck " # gpg: aka "Cornelia Huck " * remotes/cohuck/tags/s390x-20150316: s390x/config: Do not include full pci.mak s390x/pci: fix length in sei_nt2 event s390x/ipl: remove dead code s390x/virtio-bus: Remove unused function s390_virtio_bus_console() s390x: CPACF: Handle key wrap machine options s390x/kvm: make use of generic vm attribute check kvm: encapsulate HAS_DEVICE for vm attrs virtio-ccw: assure BE accesses s390x/kvm: Guest Migration TOD clock synchronization s390x: Replace unchecked qdev_init() by qdev_init_nofail() Signed-off-by: Peter Maydell --- 2dfe7d07e2f40adb18a0b0cd286f3d327692d0fc