diff options
| author | Zhang Xiantao | 2007-11-14 13:40:21 +0100 |
|---|---|---|
| committer | Avi Kivity | 2008-01-30 16:53:03 +0100 |
| commit | f8c16bbaa9e14b309ffcf29cac0ea377a35b0dd2 (patch) | |
| tree | fde560989f7c3aa77d0f869a90084369c72d7dc4 /drivers/kvm/kvm.h | |
| parent | KVM: Portability: Combine kvm_init and kvm_init_x86 (diff) | |
| download | kernel-qcow2-linux-f8c16bbaa9e14b309ffcf29cac0ea377a35b0dd2.tar.gz kernel-qcow2-linux-f8c16bbaa9e14b309ffcf29cac0ea377a35b0dd2.tar.xz kernel-qcow2-linux-f8c16bbaa9e14b309ffcf29cac0ea377a35b0dd2.zip | |
KVM: Portability: Move x86 specific code from kvm_init() to kvm_arch()
Signed-off-by: Zhang Xiantao <xiantao.zhang@intel.com>
Acked-by: Carsten Otte <cotte@de.ibm.com>
Signed-off-by: Avi Kivity <avi@qumranet.com>
Diffstat (limited to 'drivers/kvm/kvm.h')
| -rw-r--r-- | drivers/kvm/kvm.h | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/drivers/kvm/kvm.h b/drivers/kvm/kvm.h index 5e7be1504664..96d9c7da14c2 100644 --- a/drivers/kvm/kvm.h +++ b/drivers/kvm/kvm.h @@ -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); |