From: Peter Maydell Date: Thu, 3 Sep 2015 13:33:03 +0000 (+0100) Subject: Merge remote-tracking branch 'remotes/cohuck/tags/s390x-20150903' into staging X-Git-Tag: v2.5.0-rc0~157 X-Git-Url: http://xenbits.xensource.com/gitweb?a=commitdiff_plain;h=550e66ea4cce7b6664d6caf7e651814cc2d30421;p=qemu-xen-unstable.git Merge remote-tracking branch 'remotes/cohuck/tags/s390x-20150903' into staging First batch of s390x patches for 2.5: - introduce 2.5 compat machine - support for migration of storage keys # gpg: Signature made Thu 03 Sep 2015 11:28:06 BST using RSA key ID C6F02FAF # gpg: Good signature from "Cornelia Huck " # gpg: aka "Cornelia Huck " * remotes/cohuck/tags/s390x-20150903: s390x: Disable storage key migration on old machine type s390x: Migrate guest storage keys (initial memory only) s390x: Info skeys sub-command s390x: Dump-skeys hmp support s390x: Dump storage keys qmp command s390x: Enable new s390-storage-keys device s390x: Create QOM device for s390 storage keys s390x: add 2.5 compat s390-ccw-virtio machine Signed-off-by: Peter Maydell --- 550e66ea4cce7b6664d6caf7e651814cc2d30421