From 5678fd3b385f0d3157957f2fcfd5b740722d102d Mon Sep 17 00:00:00 2001 From: Zhang Xiantao Date: Fri, 23 Nov 2007 07:28:35 +0800 Subject: [PATCH] Add the arg module for kvm_arch_init Add the arg module for kvm_arch_init, since some archs may need module info. Signed-off-by: Zhang Xiantao --- drivers/kvm/kvm.h | 4 +++- drivers/kvm/kvm_main.c | 2 +- drivers/kvm/x86.c | 2 +- 3 files changed, 5 insertions(+), 3 deletions(-) diff --git a/drivers/kvm/kvm.h b/drivers/kvm/kvm.h index ca638d9..e765b32 100644 --- a/drivers/kvm/kvm.h +++ b/drivers/kvm/kvm.h @@ -15,6 +15,8 @@ #include #include #include +#include + #include #include @@ -451,7 +453,7 @@ 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); -int kvm_arch_init(void *opaque); +int kvm_arch_init(void *opaque, struct module *module); void kvm_arch_exit(void); int kvm_arch_vcpu_init(struct kvm_vcpu *vcpu); diff --git a/drivers/kvm/kvm_main.c b/drivers/kvm/kvm_main.c index 4706ed8..c738697 100644 --- a/drivers/kvm/kvm_main.c +++ b/drivers/kvm/kvm_main.c @@ -1337,7 +1337,7 @@ int kvm_init(void *opaque, unsigned int vcpu_size, kvm_init_debug(); - r = kvm_arch_init(opaque); + r = kvm_arch_init(opaque, module); if (r) goto out4; diff --git a/drivers/kvm/x86.c b/drivers/kvm/x86.c index 0873c95..f373040 100644 --- a/drivers/kvm/x86.c +++ b/drivers/kvm/x86.c @@ -1994,7 +1994,7 @@ int kvm_emulate_pio_string(struct kvm_vcpu *vcpu, struct kvm_run *run, int in, } EXPORT_SYMBOL_GPL(kvm_emulate_pio_string); -int kvm_arch_init(void *opaque) +int kvm_arch_init(void *opaque, struct module *module) { int r; struct kvm_x86_ops *ops = (struct kvm_x86_ops *)opaque; -- 1.5.1.2