diff options
| author | Anthony Liguori <aliguori@us.ibm.com> | 2011-08-25 07:50:07 -0500 |
|---|---|---|
| committer | Anthony Liguori <aliguori@us.ibm.com> | 2011-08-25 07:50:07 -0500 |
| commit | 56a7a874e962e28522857fbf72eaefb1a07e2001 (patch) | |
| tree | d68dceeae57abad08c88f0033ca7228a3cc8ae35 /target-i386/kvm.c | |
| parent | 8ef9ea85a2cc1007eaefa53e6871f1f83bcef22d (diff) | |
| parent | e99722f66ae9b25b407c3c5afe4bdd9c9395ebd9 (diff) | |
| download | qemu-56a7a874e962e28522857fbf72eaefb1a07e2001.zip qemu-56a7a874e962e28522857fbf72eaefb1a07e2001.tar.gz qemu-56a7a874e962e28522857fbf72eaefb1a07e2001.tar.bz2 | |
Merge remote-tracking branch 'stefanha/trivial-patches' into staging
Diffstat (limited to 'target-i386/kvm.c')
| -rw-r--r-- | target-i386/kvm.c | 5 |
1 files changed, 3 insertions, 2 deletions
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) { |