diff for duplicates of <20111206060401.GG12389@drongo> diff --git a/a/1.txt b/N1/1.txt index 3630a40..465a72c 100644 --- a/a/1.txt +++ b/N1/1.txt @@ -149,7 +149,7 @@ index 5efdd5b..c2ee5a7 100644 + physp = kvm->arch.slot_phys[memslot->id]; + if (!physp) return H_PARAMETER; -- if (kvm->arch.ram_pginfo[pg_index].pfn = 0) +- if (kvm->arch.ram_pginfo[pg_index].pfn == 0) + pg_index = (gfn - memslot->base_gfn) >> + (kvm->arch.ram_porder - PAGE_SHIFT); + pg_offset = vpa & (kvm->arch.ram_psize - 1); @@ -198,14 +198,14 @@ index 5efdd5b..c2ee5a7 100644 + } /* Do we already have an RMA registered? */ - if (mem->guest_phys_addr = 0 && kvm->arch.rma) + if (mem->guest_phys_addr == 0 && kvm->arch.rma) return -EINVAL; - if (totalpages > kvm->arch.ram_npages) - kvm->arch.ram_npages = totalpages; - /* Is this one of our preallocated RMAs? */ - if (mem->guest_phys_addr = 0) { + if (mem->guest_phys_addr == 0) { struct vm_area_struct *vma; @@ -1169,7 +1169,6 @@ int kvmppc_core_prepare_memory_region(struct kvm *kvm, } diff --git a/a/content_digest b/N1/content_digest index 9f23a6e..b7fba92 100644 --- a/a/content_digest +++ b/N1/content_digest @@ -1,11 +1,11 @@ "ref\020111206060156.GD12389@drongo\0" "From\0Paul Mackerras <paulus@samba.org>\0" - "Subject\0[PATCH 03/13] KVM: PPC: Keep page physical addresses in per-slot\0" - "Date\0Tue, 06 Dec 2011 06:04:01 +0000\0" + "Subject\0[PATCH 03/13] KVM: PPC: Keep page physical addresses in per-slot arrays\0" + "Date\0Tue, 6 Dec 2011 17:04:01 +1100\0" "To\0Alexander Graf <agraf@suse.de>\0" "Cc\0linuxppc-dev@ozlabs.org" - kvm-ppc@vger.kernel.org - " kvm@vger.kernel.org\0" + kvm@vger.kernel.org + " kvm-ppc@vger.kernel.org\0" "\00:1\0" "b\0" "This allocates an array for each memory slot that is added to store\n" @@ -159,7 +159,7 @@ "+\t\tphysp = kvm->arch.slot_phys[memslot->id];\n" "+\t\tif (!physp)\n" " \t\t\treturn H_PARAMETER;\n" - "-\t\tif (kvm->arch.ram_pginfo[pg_index].pfn = 0)\n" + "-\t\tif (kvm->arch.ram_pginfo[pg_index].pfn == 0)\n" "+\t\tpg_index = (gfn - memslot->base_gfn) >>\n" "+\t\t\t(kvm->arch.ram_porder - PAGE_SHIFT);\n" "+\t\tpg_offset = vpa & (kvm->arch.ram_psize - 1);\n" @@ -208,14 +208,14 @@ "+\t}\n" " \n" " \t/* Do we already have an RMA registered? */\n" - " \tif (mem->guest_phys_addr = 0 && kvm->arch.rma)\n" + " \tif (mem->guest_phys_addr == 0 && kvm->arch.rma)\n" " \t\treturn -EINVAL;\n" " \n" "-\tif (totalpages > kvm->arch.ram_npages)\n" "-\t\tkvm->arch.ram_npages = totalpages;\n" "-\n" " \t/* Is this one of our preallocated RMAs? */\n" - " \tif (mem->guest_phys_addr = 0) {\n" + " \tif (mem->guest_phys_addr == 0) {\n" " \t\tstruct vm_area_struct *vma;\n" "@@ -1169,7 +1169,6 @@ int kvmppc_core_prepare_memory_region(struct kvm *kvm,\n" " \t\t}\n" @@ -415,4 +415,4 @@ "-- \n" 1.7.5.4 -dcfe599db53ca31bd103fe7a52b548a6bc1d84bf3cad6720d6880f30fd69c705 +2dd060f3b37eb55df07fa4de14366d3e2753ad85eac1c10faf2e9b7221d13725
diff --git a/a/1.txt b/N2/1.txt index 3630a40..465a72c 100644 --- a/a/1.txt +++ b/N2/1.txt @@ -149,7 +149,7 @@ index 5efdd5b..c2ee5a7 100644 + physp = kvm->arch.slot_phys[memslot->id]; + if (!physp) return H_PARAMETER; -- if (kvm->arch.ram_pginfo[pg_index].pfn = 0) +- if (kvm->arch.ram_pginfo[pg_index].pfn == 0) + pg_index = (gfn - memslot->base_gfn) >> + (kvm->arch.ram_porder - PAGE_SHIFT); + pg_offset = vpa & (kvm->arch.ram_psize - 1); @@ -198,14 +198,14 @@ index 5efdd5b..c2ee5a7 100644 + } /* Do we already have an RMA registered? */ - if (mem->guest_phys_addr = 0 && kvm->arch.rma) + if (mem->guest_phys_addr == 0 && kvm->arch.rma) return -EINVAL; - if (totalpages > kvm->arch.ram_npages) - kvm->arch.ram_npages = totalpages; - /* Is this one of our preallocated RMAs? */ - if (mem->guest_phys_addr = 0) { + if (mem->guest_phys_addr == 0) { struct vm_area_struct *vma; @@ -1169,7 +1169,6 @@ int kvmppc_core_prepare_memory_region(struct kvm *kvm, } diff --git a/a/content_digest b/N2/content_digest index 9f23a6e..9466d6a 100644 --- a/a/content_digest +++ b/N2/content_digest @@ -1,7 +1,7 @@ "ref\020111206060156.GD12389@drongo\0" "From\0Paul Mackerras <paulus@samba.org>\0" - "Subject\0[PATCH 03/13] KVM: PPC: Keep page physical addresses in per-slot\0" - "Date\0Tue, 06 Dec 2011 06:04:01 +0000\0" + "Subject\0[PATCH 03/13] KVM: PPC: Keep page physical addresses in per-slot arrays\0" + "Date\0Tue, 6 Dec 2011 17:04:01 +1100\0" "To\0Alexander Graf <agraf@suse.de>\0" "Cc\0linuxppc-dev@ozlabs.org" kvm-ppc@vger.kernel.org @@ -159,7 +159,7 @@ "+\t\tphysp = kvm->arch.slot_phys[memslot->id];\n" "+\t\tif (!physp)\n" " \t\t\treturn H_PARAMETER;\n" - "-\t\tif (kvm->arch.ram_pginfo[pg_index].pfn = 0)\n" + "-\t\tif (kvm->arch.ram_pginfo[pg_index].pfn == 0)\n" "+\t\tpg_index = (gfn - memslot->base_gfn) >>\n" "+\t\t\t(kvm->arch.ram_porder - PAGE_SHIFT);\n" "+\t\tpg_offset = vpa & (kvm->arch.ram_psize - 1);\n" @@ -208,14 +208,14 @@ "+\t}\n" " \n" " \t/* Do we already have an RMA registered? */\n" - " \tif (mem->guest_phys_addr = 0 && kvm->arch.rma)\n" + " \tif (mem->guest_phys_addr == 0 && kvm->arch.rma)\n" " \t\treturn -EINVAL;\n" " \n" "-\tif (totalpages > kvm->arch.ram_npages)\n" "-\t\tkvm->arch.ram_npages = totalpages;\n" "-\n" " \t/* Is this one of our preallocated RMAs? */\n" - " \tif (mem->guest_phys_addr = 0) {\n" + " \tif (mem->guest_phys_addr == 0) {\n" " \t\tstruct vm_area_struct *vma;\n" "@@ -1169,7 +1169,6 @@ int kvmppc_core_prepare_memory_region(struct kvm *kvm,\n" " \t\t}\n" @@ -415,4 +415,4 @@ "-- \n" 1.7.5.4 -dcfe599db53ca31bd103fe7a52b548a6bc1d84bf3cad6720d6880f30fd69c705 +f2dba2eb89e4bdd13e7d62977688eeed2322f67f87543ee6196575fbcf460a3f
This is an external index of several public inboxes, see mirroring instructions on how to clone and mirror all data and code used by this external index.