]> git.proxmox.com Git - mirror_qemu.git/commit
Merge remote-tracking branch 'remotes/kvm/uq/master' into staging
authorPeter Maydell <peter.maydell@linaro.org>
Tue, 11 Mar 2014 19:39:17 +0000 (19:39 +0000)
committerPeter Maydell <peter.maydell@linaro.org>
Tue, 11 Mar 2014 19:39:17 +0000 (19:39 +0000)
commit239618707637ec87eba8c452d2b2f75dc5ca20c7
tree857da2ab713933e6c797d355726bae54c636e748
parent01207d0b78208c2f49c3f457d6794eea215d5be7
parentb0f15a5d5628994c71a6f428f360a5a537ad3b39
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>
exec.c
kvm-all.c