From 0f96101fcdf9d17a406fb605386b7222458c5bff Mon Sep 17 00:00:00 2001
From: Alex Williamson <alex.williamson@redhat.com>
Date: Thu, 24 Jan 2013 15:04:09 -0700
Subject: [PATCH] --- yaml --- r: 356889 b: refs/heads/master c:
 d47510e295c0f82699192a61d715351cf00f65de h: refs/heads/master i:   356887:
 a8f62290344969a5fc85a9fbab3a19a9ad29cc0e v: v3

---
 [refs]                 | 2 +-
 trunk/virt/kvm/iommu.c | 4 +++-
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/[refs] b/[refs]
index e4f05e07d277..5f370b6d589f 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 261874b0d5ebe2a5ccc544df7170d6559635e79a
+refs/heads/master: d47510e295c0f82699192a61d715351cf00f65de
diff --git a/trunk/virt/kvm/iommu.c b/trunk/virt/kvm/iommu.c
index 4a340cb23013..72a130bc448a 100644
--- a/trunk/virt/kvm/iommu.c
+++ b/trunk/virt/kvm/iommu.c
@@ -76,7 +76,9 @@ int kvm_iommu_map_pages(struct kvm *kvm, struct kvm_memory_slot *slot)
 	gfn     = slot->base_gfn;
 	end_gfn = gfn + slot->npages;
 
-	flags = IOMMU_READ | IOMMU_WRITE;
+	flags = IOMMU_READ;
+	if (!(slot->flags & KVM_MEM_READONLY))
+		flags |= IOMMU_WRITE;
 	if (kvm->arch.iommu_flags & KVM_IOMMU_CACHE_COHERENCY)
 		flags |= IOMMU_CACHE;