diff options
| author | Zhang Xiantao <xiantao.zhang@intel.com> | 2007-11-14 20:39:31 +0800 |
|---|---|---|
| committer | Avi Kivity <avi@qumranet.com> | 2008-01-30 17:53:02 +0200 |
| commit | cb498ea2ce1d3f3c0bc0a2522241dca10263e437 (patch) | |
| tree | 255eeaa3581a79ceb77772c1350faa95ce4706a6 /drivers/kvm/vmx.c | |
| parent | e9b11c17552afe684e9e5d0444309a3ddf410116 (diff) | |
| download | lwn-cb498ea2ce1d3f3c0bc0a2522241dca10263e437.tar.gz lwn-cb498ea2ce1d3f3c0bc0a2522241dca10263e437.zip | |
KVM: Portability: Combine kvm_init and kvm_init_x86
Will be called once arch module registers itself.
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/vmx.c')
| -rw-r--r-- | drivers/kvm/vmx.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/kvm/vmx.c b/drivers/kvm/vmx.c index c3bde7532714..529162345c12 100644 --- a/drivers/kvm/vmx.c +++ b/drivers/kvm/vmx.c @@ -2677,7 +2677,7 @@ static int __init vmx_init(void) memset(iova, 0xff, PAGE_SIZE); kunmap(vmx_io_bitmap_b); - r = kvm_init_x86(&vmx_x86_ops, sizeof(struct vcpu_vmx), THIS_MODULE); + r = kvm_init(&vmx_x86_ops, sizeof(struct vcpu_vmx), THIS_MODULE); if (r) goto out1; @@ -2698,7 +2698,7 @@ static void __exit vmx_exit(void) __free_page(vmx_io_bitmap_b); __free_page(vmx_io_bitmap_a); - kvm_exit_x86(); + kvm_exit(); } module_init(vmx_init) |