summaryrefslogtreecommitdiffstats
path: root/arch/x86/kvm/paging_tmpl.h
diff options
context:
space:
mode:
authorXiao Guangrong <xiaoguangrong@cn.fujitsu.com>2010-09-27 18:03:27 +0800
committerAvi Kivity <avi@redhat.com>2010-10-24 10:53:10 +0200
commit20bd40dc6492da293993559555df07d467fd202e (patch)
tree08396e178fa473a2d70a9797282d81315ce74b9c /arch/x86/kvm/paging_tmpl.h
parent6292757fb0e758748fdb441861f8c50d397de9f0 (diff)
downloadblackbird-op-linux-20bd40dc6492da293993559555df07d467fd202e.tar.gz
blackbird-op-linux-20bd40dc6492da293993559555df07d467fd202e.zip
KVM: MMU: cleanup for error mask set while walk guest page table
Small cleanup for set page fault error code Signed-off-by: Xiao Guangrong <xiaoguangrong@cn.fujitsu.com> Signed-off-by: Avi Kivity <avi@redhat.com>
Diffstat (limited to 'arch/x86/kvm/paging_tmpl.h')
-rw-r--r--arch/x86/kvm/paging_tmpl.h17
1 files changed, 7 insertions, 10 deletions
diff --git a/arch/x86/kvm/paging_tmpl.h b/arch/x86/kvm/paging_tmpl.h
index 2bdd843ad63f..a83ff3794055 100644
--- a/arch/x86/kvm/paging_tmpl.h
+++ b/arch/x86/kvm/paging_tmpl.h
@@ -224,9 +224,7 @@ walk:
is_cpuid_PSE36())
gfn += pse36_gfn_delta(pte);
- access |= write_fault ? PFERR_WRITE_MASK : 0;
- access |= fetch_fault ? PFERR_FETCH_MASK : 0;
- access |= user_fault ? PFERR_USER_MASK : 0;
+ access |= write_fault | fetch_fault | user_fault;
real_gpa = mmu->translate_gpa(vcpu, gfn_to_gpa(gfn),
access);
@@ -268,10 +266,9 @@ error:
walker->error_code = 0;
if (present)
walker->error_code |= PFERR_PRESENT_MASK;
- if (write_fault)
- walker->error_code |= PFERR_WRITE_MASK;
- if (user_fault)
- walker->error_code |= PFERR_USER_MASK;
+
+ walker->error_code |= write_fault | user_fault;
+
if (fetch_fault && mmu->nx)
walker->error_code |= PFERR_FETCH_MASK;
if (rsvd_fault)
@@ -673,9 +670,9 @@ static gpa_t FNAME(gva_to_gpa)(struct kvm_vcpu *vcpu, gva_t vaddr, u32 access,
int r;
r = FNAME(walk_addr)(&walker, vcpu, vaddr,
- !!(access & PFERR_WRITE_MASK),
- !!(access & PFERR_USER_MASK),
- !!(access & PFERR_FETCH_MASK));
+ access & PFERR_WRITE_MASK,
+ access & PFERR_USER_MASK,
+ access & PFERR_FETCH_MASK);
if (r) {
gpa = gfn_to_gpa(walker.gfn);
OpenPOWER on IntegriCloud