From: Peter Maydell Date: Wed, 21 Oct 2015 14:07:42 +0000 (+0100) Subject: Merge remote-tracking branch 'remotes/cohuck/tags/s390x-20151021-v2' into staging X-Git-Url: http://git.maquefel.me/?a=commitdiff_plain;h=8bfaa25fce2c22060a17501980943538801056de;p=qemu.git Merge remote-tracking branch 'remotes/cohuck/tags/s390x-20151021-v2' into staging More s390x patches. The first ones are fixes: A regression, missed compat and a missed part of the SIMD support. The others contain optimizations and cleanup. # gpg: Signature made Wed 21 Oct 2015 11:24:48 BST using RSA key ID C6F02FAF # gpg: Good signature from "Cornelia Huck " # gpg: aka "Cornelia Huck " * remotes/cohuck/tags/s390x-20151021-v2: s390x/cmma: clean up cmma reset s390x: reset crypto only on clear reset and QEMU reset s390x: machine reset function with new ipl cpu handling s390x/ipl: we always have an ipl device s390x: unify device reset during subsystem_reset() s390x: flagify mcic values s390x/kvm: Fix vector validity bit in device machine checks s390x/virtio-ccw: fix 2.4 virtio compat util/qemu-config: fix missing machine command line options Signed-off-by: Peter Maydell --- 8bfaa25fce2c22060a17501980943538801056de