---

yaml --- r: 356889 b: refs/heads/master c: d47510e h: refs/heads/master i: 356887: a8f6229 v: v3
git-mirror · Jan 27, 2013 · 0f96101 · 0f96101
1 parent 79bd32d
commit 0f96101
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 2 deletions.
diff --git 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
@@ -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;