|
@@ -2717,8 +2717,6 @@ int kvm_init(void *opaque, unsigned int vcpu_size,
|
|
int r;
|
|
int r;
|
|
int cpu;
|
|
int cpu;
|
|
|
|
|
|
- kvm_init_debug();
|
|
|
|
-
|
|
|
|
r = kvm_arch_init(opaque);
|
|
r = kvm_arch_init(opaque);
|
|
if (r)
|
|
if (r)
|
|
goto out_fail;
|
|
goto out_fail;
|
|
@@ -2785,6 +2783,8 @@ int kvm_init(void *opaque, unsigned int vcpu_size,
|
|
kvm_preempt_ops.sched_in = kvm_sched_in;
|
|
kvm_preempt_ops.sched_in = kvm_sched_in;
|
|
kvm_preempt_ops.sched_out = kvm_sched_out;
|
|
kvm_preempt_ops.sched_out = kvm_sched_out;
|
|
|
|
|
|
|
|
+ kvm_init_debug();
|
|
|
|
+
|
|
return 0;
|
|
return 0;
|
|
|
|
|
|
out_free:
|
|
out_free:
|
|
@@ -2807,7 +2807,6 @@ out_free_0:
|
|
out:
|
|
out:
|
|
kvm_arch_exit();
|
|
kvm_arch_exit();
|
|
out_fail:
|
|
out_fail:
|
|
- kvm_exit_debug();
|
|
|
|
return r;
|
|
return r;
|
|
}
|
|
}
|
|
EXPORT_SYMBOL_GPL(kvm_init);
|
|
EXPORT_SYMBOL_GPL(kvm_init);
|
|
@@ -2815,6 +2814,7 @@ EXPORT_SYMBOL_GPL(kvm_init);
|
|
void kvm_exit(void)
|
|
void kvm_exit(void)
|
|
{
|
|
{
|
|
tracepoint_synchronize_unregister();
|
|
tracepoint_synchronize_unregister();
|
|
|
|
+ kvm_exit_debug();
|
|
misc_deregister(&kvm_dev);
|
|
misc_deregister(&kvm_dev);
|
|
kmem_cache_destroy(kvm_vcpu_cache);
|
|
kmem_cache_destroy(kvm_vcpu_cache);
|
|
sysdev_unregister(&kvm_sysdev);
|
|
sysdev_unregister(&kvm_sysdev);
|
|
@@ -2824,7 +2824,6 @@ void kvm_exit(void)
|
|
on_each_cpu(hardware_disable, NULL, 1);
|
|
on_each_cpu(hardware_disable, NULL, 1);
|
|
kvm_arch_hardware_unsetup();
|
|
kvm_arch_hardware_unsetup();
|
|
kvm_arch_exit();
|
|
kvm_arch_exit();
|
|
- kvm_exit_debug();
|
|
|
|
free_cpumask_var(cpus_hardware_enabled);
|
|
free_cpumask_var(cpus_hardware_enabled);
|
|
__free_page(bad_page);
|
|
__free_page(bad_page);
|
|
}
|
|
}
|