OpenE2K
/
linux
6
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

KVM: Initialize the mmu caches only after verifying cpu support 

Otherwise we re-initialize the mmu caches, which will fail since the
caches are already registered, which will cause us to deinitialize said caches.

Signed-off-by: Avi Kivity <avi@qumranet.com>
This commit is contained in:
Avi Kivity 2008-01-13 13:23:56 +02:00
parent 75e68e6078
commit 97db56ce6c
1 changed files with 6 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
arch/x86/kvm/x86.c
View File

@ -2187,12 +2187,6 @@ int kvm_arch_init(void *opaque)
int r;
struct kvm_x86_ops *ops = (struct kvm_x86_ops *)opaque;
r = kvm_mmu_module_init();
if (r)
goto out_fail;
kvm_init_msr_list();
if (kvm_x86_ops) {
printk(KERN_ERR "kvm: already loaded the other module\n");
r = -EEXIST;
@ -2210,13 +2204,17 @@ int kvm_arch_init(void *opaque)
goto out;
}
r = kvm_mmu_module_init();
if (r)
goto out;
kvm_init_msr_list();
kvm_x86_ops = ops;
kvm_mmu_set_nonpresent_ptes(0ull, 0ull);
return 0;
out:
kvm_mmu_module_exit();
out_fail:
return r;
}