aboutsummaryrefslogtreecommitdiff
path: root/target-i386
diff options
context:
space:
mode:
authorPeter Maydell <peter.maydell@linaro.org>2014-03-11 19:39:17 +0000
committerPeter Maydell <peter.maydell@linaro.org>2014-03-11 19:39:17 +0000
commit239618707637ec87eba8c452d2b2f75dc5ca20c7 (patch)
tree857da2ab713933e6c797d355726bae54c636e748 /target-i386
parent01207d0b78208c2f49c3f457d6794eea215d5be7 (diff)
parentb0f15a5d5628994c71a6f428f360a5a537ad3b39 (diff)
downloadqemu-arm-239618707637ec87eba8c452d2b2f75dc5ca20c7.tar.gz
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 'target-i386')
-rw-r--r--target-i386/cpu.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/target-i386/cpu.c b/target-i386/cpu.c
index 0e8812a11d..9f69d7e192 100644
--- a/target-i386/cpu.c
+++ b/target-i386/cpu.c
@@ -339,7 +339,7 @@ static const ExtSaveArea ext_save_areas[] = {
[3] = { .feature = FEAT_7_0_EBX, .bits = CPUID_7_0_EBX_MPX,
.offset = 0x3c0, .size = 0x40 },
[4] = { .feature = FEAT_7_0_EBX, .bits = CPUID_7_0_EBX_MPX,
- .offset = 0x400, .size = 0x10 },
+ .offset = 0x400, .size = 0x40 },
};
const char *get_register_name_32(unsigned int reg)