From fdc9c41a5a3f3dc6b849d381802ae1f22c5b23a9 Mon Sep 17 00:00:00 2001 From: Jan Kiszka Date: Mon, 15 Aug 2011 16:24:48 -0700 Subject: [PATCH 1/2] Fix up some style nits of last uq/master merge Signed-off-by: Jan Kiszka Signed-off-by: Stefan Hajnoczi --- cutils.c | 2 +- target-i386/kvm.c | 5 +++-- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/cutils.c b/cutils.c index f2bcf20ffa..c91f88732e 100644 --- a/cutils.c +++ b/cutils.c @@ -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) diff --git a/target-i386/kvm.c b/target-i386/kvm.c index bd850ed7c0..1d9b20c706 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) { From e99722f66ae9b25b407c3c5afe4bdd9c9395ebd9 Mon Sep 17 00:00:00 2001 From: Frediano Ziglio Date: Thu, 25 Aug 2011 09:14:38 +0200 Subject: [PATCH 2/2] disasm: update comment Signed-off-by: Frediano Ziglio Signed-off-by: Stefan Hajnoczi --- disas.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/disas.c b/disas.c index 1334b8e0f3..611b30b55b 100644 --- a/disas.c +++ b/disas.c @@ -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