From d761dc6621acb7958872efac45c4fcc98daf947c Mon Sep 17 00:00:00 2001 From: Xiao Guangrong Date: Wed, 30 Jun 2010 16:02:45 +0800 Subject: [PATCH] --- yaml --- r: 202378 b: refs/heads/master c: 5fd5387c89ec99ff6cb82d2477ffeb7211b781c2 h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/arch/x86/kvm/paging_tmpl.h | 2 ++ 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/[refs] b/[refs] index 8a1193b47382..ebdd4d25bc4d 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 36a2e6774bfb5f32a0f23bb155f1f960321f291b +refs/heads/master: 5fd5387c89ec99ff6cb82d2477ffeb7211b781c2 diff --git a/trunk/arch/x86/kvm/paging_tmpl.h b/trunk/arch/x86/kvm/paging_tmpl.h index a21a86ef9e20..f4e4aaa65ff3 100644 --- a/trunk/arch/x86/kvm/paging_tmpl.h +++ b/trunk/arch/x86/kvm/paging_tmpl.h @@ -339,6 +339,8 @@ static u64 *FNAME(fetch)(struct kvm_vcpu *vcpu, gva_t addr, direct = 1; if (!is_dirty_gpte(gw->ptes[level - delta])) access &= ~ACC_WRITE_MASK; + access &= gw->pte_access; + /* * It is a large guest pages backed by small host pages, * So we set @direct(@sp->role.direct)=1, and set