From: Tiejun Chen Subject: [PATCH] kvm: x86: vmx: cleanup handle_ept_violation Date: Tue, 18 Nov 2014 17:12:56 +0800 Message-ID: <1416301976-6187-1-git-send-email-tiejun.chen@intel.com> Cc: kvm@vger.kernel.org To: pbonzini@redhat.com Return-path: Received: from mga02.intel.com ([134.134.136.20]:55911 "EHLO mga02.intel.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1750912AbaKRJSL (ORCPT ); Tue, 18 Nov 2014 04:18:11 -0500 Sender: kvm-owner@vger.kernel.org List-ID: Instead, just use PFERR_{FETCH, PRESENT, WRITE}_MASK inside handle_ept_violation() for slightly better code. Signed-off-by: Tiejun Chen --- arch/x86/kvm/vmx.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/arch/x86/kvm/vmx.c b/arch/x86/kvm/vmx.c index 284f5c2..22dc60d 100644 --- a/arch/x86/kvm/vmx.c +++ b/arch/x86/kvm/vmx.c @@ -5474,11 +5474,11 @@ static int handle_ept_violation(struct kvm_vcpu *vcpu) trace_kvm_page_fault(gpa, exit_qualification); /* It is a write fault? */ - error_code = exit_qualification & (1U << 1); + error_code = exit_qualification & PFERR_WRITE_MASK; /* It is a fetch fault? */ - error_code |= (exit_qualification & (1U << 2)) << 2; + error_code |= (exit_qualification << 2) & PFERR_FETCH_MASK; /* ept page table is present? */ - error_code |= (exit_qualification >> 3) & 0x1; + error_code |= (exit_qualification >> 3) & PFERR_PRESENT_MASK; vcpu->arch.exit_qualification = exit_qualification; -- 1.9.1