---

yaml --- r: 202397 b: refs/heads/master c: b0eeec2 h: refs/heads/master i: 202395: 7824ece v: v3
git-mirror · Aug 2, 2010 · 2095881 · 2095881
1 parent 6147259
commit 2095881
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 5d55f299f97769130c6cc67896414c988db309ab
+refs/heads/master: b0eeec29fe7a5b114000f769bd68ffa02652bfb7
diff --git a/trunk/arch/x86/kvm/paging_tmpl.h b/trunk/arch/x86/kvm/paging_tmpl.h
@@ -245,7 +245,7 @@ static int FNAME(walk_addr)(struct guest_walker *walker,
 		walker->error_code |= PFERR_WRITE_MASK;
 	if (user_fault)
 		walker->error_code |= PFERR_USER_MASK;
-	if (fetch_fault)
+	if (fetch_fault && is_nx(vcpu))
 		walker->error_code |= PFERR_FETCH_MASK;
 	if (rsvd_fault)
 		walker->error_code |= PFERR_RSVD_MASK;