Commit 56c6d28a authored by Zhang Xiantao's avatar Zhang Xiantao Committed by Avi Kivity
Browse files

KVM: Portability: MMU initialization and teardown split 



Move out kvm_mmu init and exit functionality from kvm_main.c

Signed-off-by: default avatarZhang Xiantao <xiantao.zhang@intel.com>
Signed-off-by: default avatarAvi Kivity <avi@qumranet.com>
parent 5bb064dc

drivers/kvm/kvm_main.c

+0 −8
Original line number Diff line number Diff line
@@ -1383,10 +1383,6 @@ int kvm_init(void *opaque, unsigned int vcpu_size, 
	int r;

	int cpu;



	r = kvm_mmu_module_init();

	if (r)

		goto out4;



	kvm_init_debug();



	r = kvm_arch_init(opaque);
@@ -1446,8 +1442,6 @@ int kvm_init(void *opaque, unsigned int vcpu_size, 
	kvm_preempt_ops.sched_in = kvm_sched_in;

	kvm_preempt_ops.sched_out = kvm_sched_out;



	kvm_mmu_set_nonpresent_ptes(0ull, 0ull);



	return 0;



out_free:
@@ -1466,7 +1460,6 @@ int kvm_init(void *opaque, unsigned int vcpu_size, 
out:

	kvm_arch_exit();

	kvm_exit_debug();

	kvm_mmu_module_exit();

out4:

	return r;

}
@@ -1485,6 +1478,5 @@ void kvm_exit(void) 
	kvm_arch_exit();

	kvm_exit_debug();

	__free_page(bad_page);

	kvm_mmu_module_exit();

}

EXPORT_SYMBOL_GPL(kvm_exit);

drivers/kvm/x86.c

+19 −5
Original line number Diff line number Diff line
@@ -1711,32 +1711,46 @@ EXPORT_SYMBOL_GPL(kvm_emulate_pio_string); 


int kvm_arch_init(void *opaque)

{

	int r;

	struct kvm_x86_ops *ops = (struct kvm_x86_ops *)opaque;



	r = kvm_mmu_module_init();

	if (r)

		goto out_fail;



	kvm_init_msr_list();



	if (kvm_x86_ops) {

		printk(KERN_ERR "kvm: already loaded the other module\n");

		return -EEXIST;

		r = -EEXIST;

		goto out;

	}



	if (!ops->cpu_has_kvm_support()) {

		printk(KERN_ERR "kvm: no hardware support\n");

		return -EOPNOTSUPP;

		r = -EOPNOTSUPP;

		goto out;

	}

	if (ops->disabled_by_bios()) {

		printk(KERN_ERR "kvm: disabled by bios\n");

		return -EOPNOTSUPP;

		r = -EOPNOTSUPP;

		goto out;

	}



	kvm_x86_ops = ops;



	kvm_mmu_set_nonpresent_ptes(0ull, 0ull);

	return 0;



out:

	kvm_mmu_module_exit();

out_fail:

	return r;

}



void kvm_arch_exit(void)

{

	kvm_x86_ops = NULL;

	kvm_mmu_module_exit();

}



int kvm_emulate_halt(struct kvm_vcpu *vcpu)