From: Peter Maydell Date: Tue, 10 Jun 2014 09:59:26 +0000 (+0100) Subject: Merge remote-tracking branch 'remotes/cohuck/tags/s390x-20140610' into staging X-Git-Url: http://git.maquefel.me/?a=commitdiff_plain;h=7b0140e49b1c239c880c90235548917086f53cdc;p=qemu.git Merge remote-tracking branch 'remotes/cohuck/tags/s390x-20140610' into staging Several patches for s390: - bugfixes: A fix for a long-standing bug in the css code as well as a fixup for the recent I/O adapter support. - Exploitation of the userspace cmma enablement/reset interface, if it is present. - Some debuggability improvements by logging unmanageable conditions. - virtio-ccw finally gets migration support for its structures. - Some cleanup as to how floating interrupts are injected. # gpg: Signature made Tue 10 Jun 2014 08:57:56 BST using RSA key ID C6F02FAF # gpg: Can't check signature: public key not found * remotes/cohuck/tags/s390x-20140610: s390x/kvm: inject via flic s390x: cleanup interrupt injection s390x/kvm: add alternative injection interface s390x: consolidate floating interrupts s390/virtio-ccw: migration support s390x/kvm: Log unmanageable program interruptions s390x/kvm: Log unmanageable external interruptions s390x/kvm: enable/reset cmma via vm attributes s390x/kvm: make flic play well with old kernels s390x/css: handle emw correctly for tsch Signed-off-by: Peter Maydell --- 7b0140e49b1c239c880c90235548917086f53cdc