mirror of
https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git
synced 2024-09-07 11:28:32 +00:00
[PATCH] KVM: Disallow the kvm-amd module on intel hardware, and vice versa
They're not on speaking terms. Signed-off-by: Avi Kivity <avi@qumranet.com> Signed-off-by: Andrew Morton <akpm@osdl.org> Signed-off-by: Linus Torvalds <torvalds@osdl.org>
This commit is contained in:
parent
802ba064c4
commit
873a7c423b
2 changed files with 3 additions and 5 deletions
|
@ -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)
|
||||
|
|
Loading…
Reference in a new issue