summaryrefslogtreecommitdiffstats
path: root/trace/control-internal.h
diff options
context:
space:
mode:
authorPeter Maydell2014-03-11 20:39:17 +0100
committerPeter Maydell2014-03-11 20:39:17 +0100
commit239618707637ec87eba8c452d2b2f75dc5ca20c7 (patch)
tree857da2ab713933e6c797d355726bae54c636e748 /trace/control-internal.h
parentqemu-thread-posix: Fix build against older glibc version (diff)
parenttarget-i386: bugfix of Intel MPX (diff)
downloadqemu-239618707637ec87eba8c452d2b2f75dc5ca20c7.tar.gz
qemu-239618707637ec87eba8c452d2b2f75dc5ca20c7.tar.xz
qemu-239618707637ec87eba8c452d2b2f75dc5ca20c7.zip
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>
Diffstat (limited to 'trace/control-internal.h')
0 files changed, 0 insertions, 0 deletions