From fedca51d2c61dae85d3b399f0c18392508cd1797 Mon Sep 17 00:00:00 2001
From: Avi Kivity <avi@qumranet.com>
Date: Thu, 11 Oct 2007 15:12:24 +0200
Subject: [PATCH] --- yaml --- r: 80655 b: refs/heads/master c:
 cc70e7374df1e3a56d718e8ca330619f316511a6 h: refs/heads/master i:   80653:
 535cedd0b8569bfef9c3f48ab0dfa58646bf7193   80651:
 9e95987b1c8fb037b60c8d3f024f0ed9dc3934ef   80647:
 3a3c3b9a3936140ed1ceb7a6f05ca77d1b467673   80639:
 4ec94ccb2de9dac565c2dade08a027ee7be0ad31 v: v3

---
 [refs]                          | 2 +-
 trunk/drivers/kvm/paging_tmpl.h | 2 ++
 2 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/[refs] b/[refs]
index a72ead490861..f7b6d68f7d43 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: c22e3514fceb2f514093ce1d19a2f660ac7347ae
+refs/heads/master: cc70e7374df1e3a56d718e8ca330619f316511a6
diff --git a/trunk/drivers/kvm/paging_tmpl.h b/trunk/drivers/kvm/paging_tmpl.h
index e07cb2e006c2..4538b1533d5b 100644
--- a/trunk/drivers/kvm/paging_tmpl.h
+++ b/trunk/drivers/kvm/paging_tmpl.h
@@ -382,6 +382,8 @@ static u64 *FNAME(fetch)(struct kvm_vcpu *vcpu, gva_t addr,
 			metaphysical = 1;
 			hugepage_access = walker->pte;
 			hugepage_access &= PT_USER_MASK | PT_WRITABLE_MASK;
+			if (!is_dirty_pte(walker->pte))
+				hugepage_access &= ~PT_WRITABLE_MASK;
 			hugepage_access >>= PT_WRITABLE_SHIFT;
 			if (walker->pte & PT64_NX_MASK)
 				hugepage_access |= (1 << 2);