diff options
Diffstat (limited to 'target-i386')
| -rw-r--r-- | target-i386/cpuid.c | 4 | ||||
| -rw-r--r-- | target-i386/op_helper.c | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/target-i386/cpuid.c b/target-i386/cpuid.c index dcfd81b7ac..04ba8d5152 100644 --- a/target-i386/cpuid.c +++ b/target-i386/cpuid.c @@ -543,7 +543,7 @@ static int check_features_against_host(x86_def_t *guest_def) ~CPUID_EXT3_SVM, ext3_feature_name, 0x80000001}}; cpu_x86_fill_host(&host_def); - for (rv = 0, i = 0; i < sizeof (ft) / sizeof (ft[0]); ++i) + for (rv = 0, i = 0; i < ARRAY_SIZE(ft); ++i) for (mask = 1; mask; mask <<= 1) if (ft[i].check_feat & mask && *ft[i].guest_feat & mask && !(*ft[i].host_feat & mask)) { @@ -965,7 +965,7 @@ void x86_cpudef_setup(void) x86_defs = &builtin_x86_defs[i]; } #if !defined(CONFIG_USER_ONLY) - qemu_opts_foreach(&qemu_cpudef_opts, cpudef_register, NULL, 0); + qemu_opts_foreach(qemu_find_opts("cpudef"), cpudef_register, NULL, 0); #endif } diff --git a/target-i386/op_helper.c b/target-i386/op_helper.c index c50e818e72..ec6b3e9384 100644 --- a/target-i386/op_helper.c +++ b/target-i386/op_helper.c @@ -5237,7 +5237,7 @@ void helper_svm_check_intercept_param(uint32_t type, uint64_t param) switch((uint32_t)ECX) { case 0 ... 0x1fff: t0 = (ECX * 2) % 8; - t1 = ECX / 8; + t1 = (ECX * 2) / 8; break; case 0xc0000000 ... 0xc0001fff: t0 = (8192 + ECX - 0xc0000000) * 2; |