提交 873a7c42 编写于 作者: A Avi Kivity 提交者: Linus Torvalds

[PATCH] KVM: Disallow the kvm-amd module on intel hardware, and vice versa

They're not on speaking terms.
Signed-off-by: NAvi Kivity <avi@qumranet.com>
Signed-off-by: NAndrew Morton <akpm@osdl.org>
Signed-off-by: NLinus Torvalds <torvalds@osdl.org>
上级 802ba064
......@@ -377,6 +377,7 @@ static __init int svm_hardware_setup(void)
void *msrpm_va;
int r;
kvm_emulator_want_group7_invlpg();
iopm_pages = alloc_pages(GFP_KERNEL, IOPM_ALLOC_ORDER);
......@@ -1628,9 +1629,7 @@ static struct kvm_arch_ops svm_arch_ops = {
static int __init svm_init(void)
{
kvm_emulator_want_group7_invlpg();
kvm_init_arch(&svm_arch_ops, THIS_MODULE);
return 0;
return kvm_init_arch(&svm_arch_ops, THIS_MODULE);
}
static void __exit svm_exit(void)
......
......@@ -2000,8 +2000,7 @@ static struct kvm_arch_ops vmx_arch_ops = {
static int __init vmx_init(void)
{
kvm_init_arch(&vmx_arch_ops, THIS_MODULE);
return 0;
return kvm_init_arch(&vmx_arch_ops, THIS_MODULE);
}
static void __exit vmx_exit(void)
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册