Commit 873a7c42 authored by Avi Kivity's avatar Avi Kivity Committed by Linus Torvalds
Browse files

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



They're not on speaking terms.

Signed-off-by: default avatarAvi Kivity <avi@qumranet.com>
Signed-off-by: default avatarAndrew Morton <akpm@osdl.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@osdl.org>
parent 802ba064
Loading
Loading
Loading
Loading
+2 −3
Original line number Diff line number Diff line
@@ -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)
+1 −2
Original line number Diff line number Diff line
@@ -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)