| Message ID | 1416301976-6187-1-git-send-email-tiejun.chen@intel.com (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
On 18/11/2014 10:12, Tiejun Chen wrote: > Instead, just use PFERR_{FETCH, PRESENT, WRITE}_MASK > inside handle_ept_violation() for slightly better code. > > Signed-off-by: Tiejun Chen <tiejun.chen@intel.com> > --- > 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; Ok. Paolo -- To unsubscribe from this list: send the line "unsubscribe kvm" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
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;
Instead, just use PFERR_{FETCH, PRESENT, WRITE}_MASK inside handle_ept_violation() for slightly better code. Signed-off-by: Tiejun Chen <tiejun.chen@intel.com> --- arch/x86/kvm/vmx.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-)