diff options
| author |   Avi Kivity <avi@qumranet.com> | 2006-12-13 00:34:14 -0800 |
|---|---|---|
| committer |   Linus Torvalds <torvalds@woody.osdl.org> | 2006-12-13 09:05:48 -0800 |
| commit | 873a7c423bf8f12bff48a4b8963b32be568b4fcf (patch) | |
| tree | 947beeefe93c4b90807d188ec15271218673a3f5 /drivers/kvm | |
| parent | [PATCH] md: Don't assume that READ==0 and WRITE==1 - use the names explicitly (diff) | |
| download | linux-dev-873a7c423bf8f12bff48a4b8963b32be568b4fcf.tar.xz linux-dev-873a7c423bf8f12bff48a4b8963b32be568b4fcf.zip | |
[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>
Diffstat (limited to '')
| -rw-r--r-- | drivers/kvm/svm.c | 5 | ||||
| -rw-r--r-- | drivers/kvm/vmx.c | 3 |
2 files changed, 3 insertions, 5 deletions
diff --git a/drivers/kvm/svm.c b/drivers/kvm/svm.c index 73a022c1f7b6..0e6bc8c649ce 100644 --- a/drivers/kvm/svm.c +++ b/drivers/kvm/svm.c @@ -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) diff --git a/drivers/kvm/vmx.c b/drivers/kvm/vmx.c index 43622061660b..d046296a9304 100644 --- a/drivers/kvm/vmx.c +++ b/drivers/kvm/vmx.c @@ -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) |