From: Avi Kivity Date: Tue, 6 Jul 2010 12:40:18 +0000 (+0300) Subject: KVM: MMU: Only indicate a fetch fault in page fault error code if nx is enabled X-Git-Tag: v2.6.36-rc1~580^2~30 X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=b0eeec29fe7a5b114000f769bd68ffa02652bfb7;p=profile%2Fivi%2Fkernel-adaptation-intel-automotive.git KVM: MMU: Only indicate a fetch fault in page fault error code if nx is enabled Bit 4 of the page fault error code is set only if EFER.NX is set. Reviewed-by: Xiao Guangrong Signed-off-by: Avi Kivity --- diff --git a/arch/x86/kvm/paging_tmpl.h b/arch/x86/kvm/paging_tmpl.h index 796a325..3a3f6d7 100644 --- a/arch/x86/kvm/paging_tmpl.h +++ b/arch/x86/kvm/paging_tmpl.h @@ -245,7 +245,7 @@ err: 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;