diff for duplicates of <20111206060323.GF12389@drongo> diff --git a/a/1.txt b/N1/1.txt index e223a39..4c69444 100644 --- a/a/1.txt +++ b/N1/1.txt @@ -230,7 +230,7 @@ index bacb0cf..6148493 100644 - if (pte_index >= (HPT_NPTEG << 3)) + if (pte_index >= HPT_NPTE) return H_PARAMETER; - if (likely((flags & H_EXACT) = 0)) { + if (likely((flags & H_EXACT) == 0)) { pte_index &= ~7UL; @@ -95,18 +106,22 @@ long kvmppc_h_enter(struct kvm_vcpu *vcpu, unsigned long flags, break; @@ -268,9 +268,9 @@ index bacb0cf..6148493 100644 hpte = (unsigned long *)(kvm->arch.hpt_virt + (pte_index << 4)); while (!lock_hpte(hpte, HPTE_V_HVLOCK)) @@ -193,7 +208,7 @@ long kvmppc_h_bulk_remove(struct kvm_vcpu *vcpu) - if (req = 3) + if (req == 3) break; - if (req != 1 || flags = 3 || + if (req != 1 || flags == 3 || - pte_index >= (HPT_NPTEG << 3)) { + pte_index >= HPT_NPTE) { /* parameter error */ @@ -290,7 +290,7 @@ index bacb0cf..6148493 100644 hpte = (unsigned long *)(kvm->arch.hpt_virt + (pte_index << 4)); while (!lock_hpte(hpte, HPTE_V_HVLOCK)) @@ -271,11 +287,21 @@ long kvmppc_h_protect(struct kvm_vcpu *vcpu, unsigned long flags, - if (atomic_read(&kvm->online_vcpus) = 1) + if (atomic_read(&kvm->online_vcpus) == 1) flags |= H_LOCAL; v = hpte[0]; - r = hpte[1] & ~(HPTE_R_PP0 | HPTE_R_PP | HPTE_R_N | @@ -328,7 +328,7 @@ index bacb0cf..6148493 100644 - offset = realaddr & (kvm->arch.ram_psize - 1); - rpn = (realaddr - offset) >> PAGE_SHIFT; - for (i = 0; i < kvm->arch.ram_npages; ++i) -- if (rpn = kvm->arch.ram_pginfo[i].pfn) +- if (rpn == kvm->arch.ram_pginfo[i].pfn) - return (i << PAGE_SHIFT) + offset; - return HPTE_R_RPN; /* all 1s in the RPN field */ -} diff --git a/a/content_digest b/N1/content_digest index a7c7b79..abe84c0 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 02/13] KVM: PPC: Keep a record of HV guest view of hashed\0" - "Date\0Tue, 06 Dec 2011 06:03:23 +0000\0" + "Subject\0[PATCH 02/13] KVM: PPC: Keep a record of HV guest view of hashed page table entries\0" + "Date\0Tue, 6 Dec 2011 17:03:23 +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 adds an array that parallels the guest hashed page table (HPT),\n" @@ -240,7 +240,7 @@ "-\tif (pte_index >= (HPT_NPTEG << 3))\n" "+\tif (pte_index >= HPT_NPTE)\n" " \t\treturn H_PARAMETER;\n" - " \tif (likely((flags & H_EXACT) = 0)) {\n" + " \tif (likely((flags & H_EXACT) == 0)) {\n" " \t\tpte_index &= ~7UL;\n" "@@ -95,18 +106,22 @@ long kvmppc_h_enter(struct kvm_vcpu *vcpu, unsigned long flags,\n" " \t\t\t\tbreak;\n" @@ -278,9 +278,9 @@ " \thpte = (unsigned long *)(kvm->arch.hpt_virt + (pte_index << 4));\n" " \twhile (!lock_hpte(hpte, HPTE_V_HVLOCK))\n" "@@ -193,7 +208,7 @@ long kvmppc_h_bulk_remove(struct kvm_vcpu *vcpu)\n" - " \t\tif (req = 3)\n" + " \t\tif (req == 3)\n" " \t\t\tbreak;\n" - " \t\tif (req != 1 || flags = 3 ||\n" + " \t\tif (req != 1 || flags == 3 ||\n" "-\t\t pte_index >= (HPT_NPTEG << 3)) {\n" "+\t\t pte_index >= HPT_NPTE) {\n" " \t\t\t/* parameter error */\n" @@ -300,7 +300,7 @@ " \thpte = (unsigned long *)(kvm->arch.hpt_virt + (pte_index << 4));\n" " \twhile (!lock_hpte(hpte, HPTE_V_HVLOCK))\n" "@@ -271,11 +287,21 @@ long kvmppc_h_protect(struct kvm_vcpu *vcpu, unsigned long flags,\n" - " \tif (atomic_read(&kvm->online_vcpus) = 1)\n" + " \tif (atomic_read(&kvm->online_vcpus) == 1)\n" " \t\tflags |= H_LOCAL;\n" " \tv = hpte[0];\n" "-\tr = hpte[1] & ~(HPTE_R_PP0 | HPTE_R_PP | HPTE_R_N |\n" @@ -338,7 +338,7 @@ "-\toffset = realaddr & (kvm->arch.ram_psize - 1);\n" "-\trpn = (realaddr - offset) >> PAGE_SHIFT;\n" "-\tfor (i = 0; i < kvm->arch.ram_npages; ++i)\n" - "-\t\tif (rpn = kvm->arch.ram_pginfo[i].pfn)\n" + "-\t\tif (rpn == kvm->arch.ram_pginfo[i].pfn)\n" "-\t\t\treturn (i << PAGE_SHIFT) + offset;\n" "-\treturn HPTE_R_RPN;\t/* all 1s in the RPN field */\n" "-}\n" @@ -378,4 +378,4 @@ "-- \n" 1.7.5.4 -124374789a5c310ff1670ec0c09012051d7e8a36436ad8307f85bd129a123adf +ad79faf21c05f4d0bcaee3053ca46478fabe7750d0e7a3fcc6e96aed7eacdf9b
diff --git a/a/1.txt b/N2/1.txt index e223a39..4c69444 100644 --- a/a/1.txt +++ b/N2/1.txt @@ -230,7 +230,7 @@ index bacb0cf..6148493 100644 - if (pte_index >= (HPT_NPTEG << 3)) + if (pte_index >= HPT_NPTE) return H_PARAMETER; - if (likely((flags & H_EXACT) = 0)) { + if (likely((flags & H_EXACT) == 0)) { pte_index &= ~7UL; @@ -95,18 +106,22 @@ long kvmppc_h_enter(struct kvm_vcpu *vcpu, unsigned long flags, break; @@ -268,9 +268,9 @@ index bacb0cf..6148493 100644 hpte = (unsigned long *)(kvm->arch.hpt_virt + (pte_index << 4)); while (!lock_hpte(hpte, HPTE_V_HVLOCK)) @@ -193,7 +208,7 @@ long kvmppc_h_bulk_remove(struct kvm_vcpu *vcpu) - if (req = 3) + if (req == 3) break; - if (req != 1 || flags = 3 || + if (req != 1 || flags == 3 || - pte_index >= (HPT_NPTEG << 3)) { + pte_index >= HPT_NPTE) { /* parameter error */ @@ -290,7 +290,7 @@ index bacb0cf..6148493 100644 hpte = (unsigned long *)(kvm->arch.hpt_virt + (pte_index << 4)); while (!lock_hpte(hpte, HPTE_V_HVLOCK)) @@ -271,11 +287,21 @@ long kvmppc_h_protect(struct kvm_vcpu *vcpu, unsigned long flags, - if (atomic_read(&kvm->online_vcpus) = 1) + if (atomic_read(&kvm->online_vcpus) == 1) flags |= H_LOCAL; v = hpte[0]; - r = hpte[1] & ~(HPTE_R_PP0 | HPTE_R_PP | HPTE_R_N | @@ -328,7 +328,7 @@ index bacb0cf..6148493 100644 - offset = realaddr & (kvm->arch.ram_psize - 1); - rpn = (realaddr - offset) >> PAGE_SHIFT; - for (i = 0; i < kvm->arch.ram_npages; ++i) -- if (rpn = kvm->arch.ram_pginfo[i].pfn) +- if (rpn == kvm->arch.ram_pginfo[i].pfn) - return (i << PAGE_SHIFT) + offset; - return HPTE_R_RPN; /* all 1s in the RPN field */ -} diff --git a/a/content_digest b/N2/content_digest index a7c7b79..5ad6d67 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 02/13] KVM: PPC: Keep a record of HV guest view of hashed\0" - "Date\0Tue, 06 Dec 2011 06:03:23 +0000\0" + "Subject\0[PATCH 02/13] KVM: PPC: Keep a record of HV guest view of hashed page table entries\0" + "Date\0Tue, 6 Dec 2011 17:03:23 +1100\0" "To\0Alexander Graf <agraf@suse.de>\0" "Cc\0linuxppc-dev@ozlabs.org" kvm-ppc@vger.kernel.org @@ -240,7 +240,7 @@ "-\tif (pte_index >= (HPT_NPTEG << 3))\n" "+\tif (pte_index >= HPT_NPTE)\n" " \t\treturn H_PARAMETER;\n" - " \tif (likely((flags & H_EXACT) = 0)) {\n" + " \tif (likely((flags & H_EXACT) == 0)) {\n" " \t\tpte_index &= ~7UL;\n" "@@ -95,18 +106,22 @@ long kvmppc_h_enter(struct kvm_vcpu *vcpu, unsigned long flags,\n" " \t\t\t\tbreak;\n" @@ -278,9 +278,9 @@ " \thpte = (unsigned long *)(kvm->arch.hpt_virt + (pte_index << 4));\n" " \twhile (!lock_hpte(hpte, HPTE_V_HVLOCK))\n" "@@ -193,7 +208,7 @@ long kvmppc_h_bulk_remove(struct kvm_vcpu *vcpu)\n" - " \t\tif (req = 3)\n" + " \t\tif (req == 3)\n" " \t\t\tbreak;\n" - " \t\tif (req != 1 || flags = 3 ||\n" + " \t\tif (req != 1 || flags == 3 ||\n" "-\t\t pte_index >= (HPT_NPTEG << 3)) {\n" "+\t\t pte_index >= HPT_NPTE) {\n" " \t\t\t/* parameter error */\n" @@ -300,7 +300,7 @@ " \thpte = (unsigned long *)(kvm->arch.hpt_virt + (pte_index << 4));\n" " \twhile (!lock_hpte(hpte, HPTE_V_HVLOCK))\n" "@@ -271,11 +287,21 @@ long kvmppc_h_protect(struct kvm_vcpu *vcpu, unsigned long flags,\n" - " \tif (atomic_read(&kvm->online_vcpus) = 1)\n" + " \tif (atomic_read(&kvm->online_vcpus) == 1)\n" " \t\tflags |= H_LOCAL;\n" " \tv = hpte[0];\n" "-\tr = hpte[1] & ~(HPTE_R_PP0 | HPTE_R_PP | HPTE_R_N |\n" @@ -338,7 +338,7 @@ "-\toffset = realaddr & (kvm->arch.ram_psize - 1);\n" "-\trpn = (realaddr - offset) >> PAGE_SHIFT;\n" "-\tfor (i = 0; i < kvm->arch.ram_npages; ++i)\n" - "-\t\tif (rpn = kvm->arch.ram_pginfo[i].pfn)\n" + "-\t\tif (rpn == kvm->arch.ram_pginfo[i].pfn)\n" "-\t\t\treturn (i << PAGE_SHIFT) + offset;\n" "-\treturn HPTE_R_RPN;\t/* all 1s in the RPN field */\n" "-}\n" @@ -378,4 +378,4 @@ "-- \n" 1.7.5.4 -124374789a5c310ff1670ec0c09012051d7e8a36436ad8307f85bd129a123adf +f4e7d2da6726b182e050b22cf82e04df58fbcd71baffbfd68beb412b7fe721c0
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.