]> git.proxmox.com Git - mirror_qemu.git/commitdiff
Merge remote-tracking branch 'borntraeger/s390-for-1.6' into staging
authorAnthony Liguori <aliguori@us.ibm.com>
Tue, 30 Jul 2013 23:48:36 +0000 (18:48 -0500)
committerAnthony Liguori <aliguori@us.ibm.com>
Tue, 30 Jul 2013 23:48:36 +0000 (18:48 -0500)
* borntraeger/s390-for-1.6:
  s390: Implement dump-guest-memory support for target s390x
  s390x/kvm: Remove redundant return code
  s390x/kvm: Reworked/fixed handling of cc3 in kvm_handle_css_inst()
  s390x/ioinst: Fixed priority of operand exceptions
  s390x/ioinst: Fixed alignment check in SCHM instruction
  s390x/ioinst: Throw addressing exception when memory_map failed
  s390x/ioinst: Add missing alignment checks for IO instructions
  s390/sclpconsole: handle char layer busy conditions

Signed-off-by: Anthony Liguori <aliguori@us.ibm.com>

Trivial merge