commit | 239618707637ec87eba8c452d2b2f75dc5ca20c7 | [log] [tgz] |
---|---|---|
author | Peter Maydell <peter.maydell@linaro.org> | Tue Mar 11 19:39:17 2014 +0000 |
committer | Peter Maydell <peter.maydell@linaro.org> | Tue Mar 11 19:39:17 2014 +0000 |
tree | 857da2ab713933e6c797d355726bae54c636e748 | |
parent | 01207d0b78208c2f49c3f457d6794eea215d5be7 [diff] | |
parent | b0f15a5d5628994c71a6f428f360a5a537ad3b39 [diff] |
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>