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>
This commit is contained in:
Jan Kiszka
2011-08-25 09:21:35 +01:00
committed by Stefan Hajnoczi
parent 89da90b1b4
commit fdc9c41a5a
2 changed files with 4 additions and 3 deletions
+1 -1
View File
@@ -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)
+3 -2
View File
@@ -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) {