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

KVM: Portability: Move x86 specific code from kvm_init() to kvm_arch() 



Signed-off-by: default avatarZhang Xiantao <xiantao.zhang@intel.com>
Acked-by: default avatarCarsten Otte <cotte@de.ibm.com>
Signed-off-by: default avatarAvi Kivity <avi@qumranet.com>
parent cb498ea2

drivers/kvm/kvm.h

+3 −2
Original line number Diff line number Diff line
@@ -495,7 +495,7 @@ void vcpu_put(struct kvm_vcpu *vcpu); 
void decache_vcpus_on_cpu(int cpu);





int kvm_init(struct kvm_x86_ops *ops, unsigned int vcpu_size,

int kvm_init(void *opaque, unsigned int vcpu_size,

		  struct module *module);

void kvm_exit(void);
@@ -649,7 +649,8 @@ int kvm_arch_vcpu_ioctl_debug_guest(struct kvm_vcpu *vcpu, 
				    struct kvm_debug_guest *dbg);

int kvm_arch_vcpu_ioctl_run(struct kvm_vcpu *vcpu, struct kvm_run *kvm_run);



__init void kvm_arch_init(void);

int kvm_arch_init(void *opaque);

void kvm_arch_exit(void);



int kvm_arch_vcpu_init(struct kvm_vcpu *vcpu);

void kvm_arch_vcpu_uninit(struct kvm_vcpu *vcpu);

drivers/kvm/kvm_main.c

+6 −20
Original line number Diff line number Diff line
@@ -1434,7 +1434,7 @@ static void kvm_sched_out(struct preempt_notifier *pn, 
	kvm_arch_vcpu_put(vcpu);

}



int kvm_init(struct kvm_x86_ops *ops, unsigned int vcpu_size,

int kvm_init(void *opaque, unsigned int vcpu_size,

		  struct module *module)

{

	int r;
@@ -1446,7 +1446,9 @@ int kvm_init(struct kvm_x86_ops *ops, unsigned int vcpu_size, 


	kvm_init_debug();



	kvm_arch_init();

	r = kvm_arch_init(opaque);

	if (r)

		goto out4;



	bad_page = alloc_page(GFP_KERNEL | __GFP_ZERO);
@@ -1455,22 +1457,6 @@ int kvm_init(struct kvm_x86_ops *ops, unsigned int vcpu_size, 
		goto out;

	}



	if (kvm_x86_ops) {

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

		return -EEXIST;

	}



	if (!ops->cpu_has_kvm_support()) {

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

		return -EOPNOTSUPP;

	}

	if (ops->disabled_by_bios()) {

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

		return -EOPNOTSUPP;

	}



	kvm_x86_ops = ops;



	r = kvm_arch_hardware_setup();

	if (r < 0)

		goto out;
@@ -1534,7 +1520,7 @@ int kvm_init(struct kvm_x86_ops *ops, unsigned int vcpu_size, 
out_free_0:

	kvm_arch_hardware_unsetup();

out:

	kvm_x86_ops = NULL;

	kvm_arch_exit();

	kvm_exit_debug();

	kvm_mmu_module_exit();

out4:
@@ -1552,7 +1538,7 @@ void kvm_exit(void) 
	unregister_cpu_notifier(&kvm_cpu_notifier);

	on_each_cpu(hardware_disable, NULL, 0, 1);

	kvm_arch_hardware_unsetup();

	kvm_x86_ops = NULL;

	kvm_arch_exit();

	kvm_exit_debug();

	__free_page(bad_page);

	kvm_mmu_module_exit();

drivers/kvm/x86.c

+26 −1
Original line number Diff line number Diff line
@@ -1645,9 +1645,34 @@ int kvm_emulate_pio_string(struct kvm_vcpu *vcpu, struct kvm_run *run, int in, 
}

EXPORT_SYMBOL_GPL(kvm_emulate_pio_string);



__init void kvm_arch_init(void)

int kvm_arch_init(void *opaque)

{

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



	kvm_init_msr_list();



	if (kvm_x86_ops) {

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

		return -EEXIST;

	}



	if (!ops->cpu_has_kvm_support()) {

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

		return -EOPNOTSUPP;

	}

	if (ops->disabled_by_bios()) {

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

		return -EOPNOTSUPP;

	}



	kvm_x86_ops = ops;



	return 0;

}



void kvm_arch_exit(void)

{

	kvm_x86_ops = NULL;

 }



int kvm_emulate_halt(struct kvm_vcpu *vcpu)