---

yaml --- r: 197832 b: refs/heads/master c: 0d945bd h: refs/heads/master v: v3
git-mirror · May 19, 2010 · 304773a · 304773a
1 parent 9263fe7
commit 304773a
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 1 deletion.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 3f0fd2927b737c0ac2e04af7858b60d1e927d4b1
+refs/heads/master: 0d945bd9351199744c1e89d57a70615b6ee9f394
diff --git a/trunk/arch/x86/kvm/svm.c b/trunk/arch/x86/kvm/svm.c
@@ -2036,6 +2036,9 @@ static bool nested_svm_vmrun(struct vcpu_svm *svm)
 		svm->vmcb->control.intercept_cr_write &= ~INTERCEPT_CR8_MASK;
 	}
 
+	/* We don't want to see VMMCALLs from a nested guest */
+	svm->vmcb->control.intercept &= ~(1ULL << INTERCEPT_VMMCALL);
+
 	/*
 	 * We don't want a nested guest to be more powerful than the guest, so
 	 * all intercepts are ORed