From: Peter Maydell <peter.maydell@linaro.org>
Date: Tue, 11 Mar 2014 19:39:17 +0000 (+0000)
Subject: Merge remote-tracking branch 'remotes/kvm/uq/master' into staging
X-Git-Url: http://git.maquefel.me/?a=commitdiff_plain;h=239618707637ec87eba8c452d2b2f75dc5ca20c7;p=qemu.git

Merge remote-tracking branch 'remotes/kvm/uq/master' into staging

* remotes/kvm/uq/master:
  target-i386: bugfix of Intel MPX
  file_ram_alloc: unify mem-path,mem-prealloc error handling
  kvm-all: exit in case max vcpus exceeded

Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
---

239618707637ec87eba8c452d2b2f75dc5ca20c7