[kvm-devel] [PATCH] 5/5 Make kvm_init as arch-indepenent

[Zhang, X. <xia...@in...>]

>From 2d6ee07b96f1a91cef9327f241077af3698ed4dc Mon Sep 17 00:00:00 2001
From: Zhang Xiantao <xia...@in...>
Date: Thu, 8 Nov 2007 13:37:38 +0800
Subject: [PATCH] Make kvm_init as arch-indepenent, through defining a
void
pointer type variable. All archs will register their corresponding arch
functions
into kvm module. For example, x86 will use it to register vmx/svm's ops.
Signed-off-by: Zhang Xiantao <xia...@in...>
---
 drivers/kvm/kvm.h      |    5 +++--
 drivers/kvm/kvm_main.c |   26 ++++++--------------------
 drivers/kvm/x86.c      |   27 ++++++++++++++++++++++++++-
 3 files changed, 35 insertions(+), 23 deletions(-)

diff --git a/drivers/kvm/kvm.h b/drivers/kvm/kvm.h
index 33b4629..9b6087f 100644
--- a/drivers/kvm/kvm.h
+++ b/drivers/kvm/kvm.h
@@ -494,7 +494,7 @@ void vcpu_load(struct kvm_vcpu *vcpu);
 void vcpu_put(struct kvm_vcpu *vcpu);
=20
=20
-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);
=20
@@ -647,7 +647,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);
=20
-__init void kvm_arch_init(void);
+int kvm_arch_init(void *opaque);
+void kvm_arch_exit(void);
=20
=20
 void kvm_arch_vcpu_free(struct kvm_vcpu *vcpu);
diff --git a/drivers/kvm/kvm_main.c b/drivers/kvm/kvm_main.c
index 8f09170..70bc4d4 100644
--- a/drivers/kvm/kvm_main.c
+++ b/drivers/kvm/kvm_main.c
@@ -1503,7 +1503,7 @@ static void kvm_sched_out(struct preempt_notifier
*pn,
 	kvm_arch_vcpu_put(vcpu);
 }
=20
-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;
@@ -1515,7 +1515,9 @@ int kvm_init(struct kvm_x86_ops *ops, unsigned int
vcpu_size,
=20
 	kvm_init_debug();
=20
-	kvm_arch_init();
+	r =3D kvm_arch_init(opaque);
+	if (r)
+		goto out4;
=20
 	bad_page =3D alloc_page(GFP_KERNEL | __GFP_ZERO);
=20
@@ -1524,22 +1526,6 @@ int kvm_init(struct kvm_x86_ops *ops, unsigned
int vcpu_size,
 		goto out;
 	}
=20
-	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 =3D ops;
-
 	r =3D kvm_arch_hardware_setup();
 	if (r < 0)
 		goto out;
@@ -1603,7 +1589,7 @@ out_free_1:
 out_free_0:
 	kvm_arch_hardware_unsetup();
 out:
-	kvm_x86_ops =3D NULL;
+	kvm_arch_exit();
 	kvm_exit_debug();
 	kvm_mmu_module_exit();
 out4:  =20
@@ -1621,7 +1607,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 =3D NULL;
+	kvm_arch_exit();
 	kvm_exit_debug();
 	__free_page(bad_page);
 	kvm_mmu_module_exit();
diff --git a/drivers/kvm/x86.c b/drivers/kvm/x86.c
index 8aea240..22b3cc6 100644
--- a/drivers/kvm/x86.c
+++ b/drivers/kvm/x86.c
@@ -1611,9 +1611,34 @@ int kvm_emulate_pio_string(struct kvm_vcpu *vcpu,
struct kvm_run *run, int in,
 }
 EXPORT_SYMBOL_GPL(kvm_emulate_pio_string);
=20
-__init void kvm_arch_init(void)
+int kvm_arch_init(void *opaque)
 {
+	struct kvm_x86_ops *ops =3D (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 =3D ops;
+
+	return 0;
+}
+
+void kvm_arch_exit(void)
+{
+	kvm_x86_ops =3D NULL;
 }
=20
 int kvm_emulate_halt(struct kvm_vcpu *vcpu)
--=20
1.5.1.2