diff options
| -rw-r--r-- | cutils.c | 2 | ||||
| -rw-r--r-- | disas.c | 2 | ||||
| -rw-r--r-- | target-i386/kvm.c | 5 |
3 files changed, 5 insertions, 4 deletions
@@ -408,7 +408,7 @@ fail: int64_t strtosz_suffix(const char *nptr, char **end, const char default_suffix) { - return strtosz_suffix_unit(nptr, end, default_suffix, 1024); + return strtosz_suffix_unit(nptr, end, default_suffix, 1024); } int64_t strtosz(const char *nptr, char **end) @@ -137,7 +137,7 @@ print_insn_thumb1(bfd_vma pc, disassemble_info *info) /* Disassemble this for me please... (debugging). 'flags' has the following values: - i386 - nonzero means 16 bit code + i386 - 1 means 16 bit code, 2 means 64 bit code arm - nonzero means thumb code ppc - nonzero means little endian other targets - unused diff --git a/target-i386/kvm.c b/target-i386/kvm.c index bd850ed..1d9b20c 100644 --- a/target-i386/kvm.c +++ b/target-i386/kvm.c @@ -501,8 +501,9 @@ int kvm_arch_init_vcpu(CPUState *env) qemu_add_vm_change_state_handler(cpu_update_state, env); r = kvm_vcpu_ioctl(env, KVM_SET_CPUID2, &cpuid_data); - if (r) - return r; + if (r) { + return r; + } r = kvm_check_extension(env->kvm_state, KVM_CAP_TSC_CONTROL); if (r && env->tsc_khz) { |