From c08d8ec334363c045e00ad0690c1dc3ea133adc2 Mon Sep 17 00:00:00 2001 From: Yoshimi Ichiyanagi Date: Fri, 29 Dec 2006 16:49:41 -0800 Subject: [PATCH] --- yaml --- r: 45135 b: refs/heads/master c: 09db28b8a3765a7ec35eba80420c71a7973f5a88 h: refs/heads/master i: 45133: dfd177cae9dc3c9562b9e3ae4bb99d3251fe7457 45131: 856796f9bd108f16ae6eb0cda15ff2fd3da2804b 45127: 2074903ca70ca2a23f6c0dc9d59ba35454d737d4 45119: 4568485caa4800b80df391661da289dc6fad23ea v: v3 --- [refs] | 2 +- trunk/drivers/kvm/kvm_main.c | 6 ++++++ 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/[refs] b/[refs] index 411b9a007479..dcc791c3c3f4 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: a9058ecd3cd72634cf548588ce79b3f225c9ca32 +refs/heads/master: 09db28b8a3765a7ec35eba80420c71a7973f5a88 diff --git a/trunk/drivers/kvm/kvm_main.c b/trunk/drivers/kvm/kvm_main.c index 38375e2bb703..06314071c6d2 100644 --- a/trunk/drivers/kvm/kvm_main.c +++ b/trunk/drivers/kvm/kvm_main.c @@ -1865,6 +1865,11 @@ int kvm_init_arch(struct kvm_arch_ops *ops, struct module *module) { int r; + if (kvm_arch_ops) { + printk(KERN_ERR "kvm: already loaded the other module\n"); + return -EEXIST; + } + kvm_arch_ops = ops; if (!kvm_arch_ops->cpu_has_kvm_support()) { @@ -1907,6 +1912,7 @@ void kvm_exit_arch(void) unregister_reboot_notifier(&kvm_reboot_notifier); on_each_cpu(kvm_arch_ops->hardware_disable, 0, 0, 1); kvm_arch_ops->hardware_unsetup(); + kvm_arch_ops = NULL; } static __init int kvm_init(void)