From 7304426994da721b8082652e51b4cf207e012dfc Mon Sep 17 00:00:00 2001
From: Joerg Roedel <joerg.roedel@amd.com>
Date: Thu, 22 Apr 2010 12:33:10 +0200
Subject: [PATCH] --- yaml --- r: 197807 b: refs/heads/master c:
 228070b1b31abc16c331b57bf965101c6eb1d167 h: refs/heads/master i:   197805:
 b2569c2d021ffcd7c3ccd7dc232d8a01f18a7078   197803:
 781d364f11347c5c3abce77b6a87a93b88ba1161   197799:
 c9d7d9a0f9c8717a09ddadde15c2f16101fff4d4   197791:
 8959cc21d05d50f3ad99faa905a058234a13ca64 v: v3

---
 [refs]                   | 2 +-
 trunk/arch/x86/kvm/svm.c | 4 ++++
 2 files changed, 5 insertions(+), 1 deletion(-)

diff --git a/[refs] b/[refs]
index 45265c4402a0..1ddeb83f6f7e 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 2be4fc7a02c368dcfda83a386a5101c211b9535e
+refs/heads/master: 228070b1b31abc16c331b57bf965101c6eb1d167
diff --git a/trunk/arch/x86/kvm/svm.c b/trunk/arch/x86/kvm/svm.c
index 5ad9d802bd16..b10d1630c203 100644
--- a/trunk/arch/x86/kvm/svm.c
+++ b/trunk/arch/x86/kvm/svm.c
@@ -1715,6 +1715,10 @@ static int nested_svm_intercept(struct vcpu_svm *svm)
 			vmexit = NESTED_EXIT_DONE;
 		break;
 	}
+	case SVM_EXIT_ERR: {
+		vmexit = NESTED_EXIT_DONE;
+		break;
+	}
 	default: {
 		u64 exit_bits = 1ULL << (exit_code - SVM_EXIT_INTR);
 		if (svm->nested.intercept & exit_bits)