From: Peter Maydell Date: Sat, 25 Feb 2017 17:48:49 +0000 (+0000) Subject: Merge remote-tracking branch 'remotes/cohuck/tags/s390x-20170224' into staging X-Git-Url: http://git.maquefel.me/?a=commitdiff_plain;h=2421f381dc38a8a6d12477c08c2f74a35a0698f8;p=qemu.git Merge remote-tracking branch 'remotes/cohuck/tags/s390x-20170224' into staging A selection of s390x patches: - cleanups, fixes and improvements - program check loop detection (useful with the corresponding kernel patch) - wire up virtio-crypto for ccw - and finally support many virtqueues for virtio-ccw # gpg: Signature made Fri 24 Feb 2017 09:19:19 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-20170224: s390x/css: handle format-0 TIC CCW correctly s390x/arch_dump: pass cpuid into notes sections s390x/arch_dump: use proper note name and note size virtio-ccw: support VIRTIO_QUEUE_MAX virtqueues s390x: bump ADAPTER_ROUTES_MAX_GSI virtio-ccw: check flic->adapter_routes_max_batch s390x: add property adapter_routes_max_batch virtio-ccw: Check the number of vqs in CCW_CMD_SET_IND virtio-ccw: add virtio-crypto-ccw device virtio-ccw: handle virtio 1 only devices s390x/flic: fail migration on source already s390x/kvm: detect some program check loops s390x/s390-virtio: get rid of DPRINTF Signed-off-by: Peter Maydell --- 2421f381dc38a8a6d12477c08c2f74a35a0698f8