From: Aurelien Jarno <aurelien@aurel32.net>
Date: Mon, 23 May 2011 20:33:39 +0000 (+0200)
Subject: Merge branch 's390-next' of git://repo.or.cz/qemu/agraf
X-Git-Tag: v0.15.0-rc0~256
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=05c8a1e423736006580e4dd2bd94d0faafc9afdc;p=thirdparty%2Fqemu.git

Merge branch 's390-next' of git://repo.or.cz/qemu/agraf

* 's390-next' of git://repo.or.cz/qemu/agraf:
  s390x: complain when allocating ram fails
  s390x: fix memory detection for guests > 64GB
  s390x: change mapping base to allow guests > 2GB
  s390x: Fix debugging for unknown sigp order codes
  s390x: build s390x by default
  s390x: remove compatibility cc field
  s390x: Adjust GDB stub
  s390x: translate engine for s390x CPU
  s390x: Adjust internal kvm code
  s390x: Implement opcode helpers
  s390x: helper functions for system emulation
  s390x: Shift variables in CPUState for memset(0)
  s390x: keep hint on virtio managing size
  s390x: make kvm exported functions conditional on kvm
  s390x: s390x-linux-user support
  tcg: extend max tcg opcodes when using 64-on-32bit
  s390x: fix smp support for kvm
---

05c8a1e423736006580e4dd2bd94d0faafc9afdc