diff options
| author | Jan Kiszka <jan.kiszka@web.de> | 2011-08-15 16:24:48 -0700 |
|---|---|---|
| committer | Stefan Hajnoczi <stefanha@linux.vnet.ibm.com> | 2011-08-25 09:21:35 +0100 |
| commit | fdc9c41a5a3f3dc6b849d381802ae1f22c5b23a9 (patch) | |
| tree | 5b02d8fdfc5f4937ad6740cb8e08a4254fec64d7 | |
| parent | 89da90b1b4acf24a9a3f2fd197b1bdf69ab24e72 (diff) | |
| download | qemu-fdc9c41a5a3f3dc6b849d381802ae1f22c5b23a9.zip qemu-fdc9c41a5a3f3dc6b849d381802ae1f22c5b23a9.tar.gz qemu-fdc9c41a5a3f3dc6b849d381802ae1f22c5b23a9.tar.bz2 | |
Fix up some style nits of last uq/master merge
Signed-off-by: Jan Kiszka <jan.kiszka@siemens.com>
Signed-off-by: Stefan Hajnoczi <stefanha@linux.vnet.ibm.com>
| -rw-r--r-- | cutils.c | 2 | ||||
| -rw-r--r-- | target-i386/kvm.c | 5 |
2 files changed, 4 insertions, 3 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) 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) { |