diff for duplicates of <51DC4923.5010501@suse.de> diff --git a/a/1.txt b/N1/1.txt index 1e64ba2..7496827 100644 --- a/a/1.txt +++ b/N1/1.txt @@ -280,7 +280,7 @@ Alex > > - hva = kvmppc_vm_gpa_to_hva_and_get(vcpu, tce,&pg,&hpa); > + hva = kvmppc_vm_gpa_to_hva_and_get(vcpu, tt, tce,&pg,&hpa); -> if (hva = ERROR_ADDR) +> if (hva == ERROR_ADDR) > return H_HARDWARE; > } > @@ -372,7 +464,7 @@ long kvmppc_vm_h_put_tce_iommu(struct kvm_vcpu *vcpu, @@ -299,7 +299,7 @@ Alex > - hva = kvmppc_vm_gpa_to_hva_and_get(vcpu, gpa,&pg, > + hva = kvmppc_vm_gpa_to_hva_and_get(vcpu, tt, gpa,&pg, > &vcpu->arch.tce_tmp_hpas[i]); -> if (hva = ERROR_ADDR) +> if (hva == ERROR_ADDR) > goto putpages_flush_exit; > @@ -429,7 +521,7 @@ putpages_flush_exit: > for ( --i; i>= 0; --i) { @@ -316,7 +316,7 @@ Alex > > - tces = kvmppc_vm_gpa_to_hva_and_get(vcpu, tce_list,&pg, NULL); > + tces = kvmppc_vm_gpa_to_hva_and_get(vcpu, tt, tce_list,&pg, NULL); -> if (tces = ERROR_ADDR) +> if (tces == ERROR_ADDR) > return H_TOO_HARD; > > @@ -547,7 +639,7 @@ long kvmppc_vm_h_put_tce_indirect(struct kvm_vcpu *vcpu, @@ -367,7 +367,7 @@ Alex > > - hpa = kvmppc_rm_gpa_to_hpa_and_get(vcpu, tce,&pg); > + hpa = kvmppc_rm_gpa_to_hpa_and_get(vcpu, tt, tce,&pg); -> if (hpa = ERROR_ADDR) +> if (hpa == ERROR_ADDR) > return H_TOO_HARD; > > @@ -247,7 +262,7 @@ static long kvmppc_h_put_tce_indirect_iommu(struct kvm_vcpu *vcpu, @@ -376,7 +376,7 @@ Alex > for (i = 0; i< npages; ++i) { > - hpa = kvmppc_rm_gpa_to_hpa_and_get(vcpu, tces[i],&pg); > + hpa = kvmppc_rm_gpa_to_hpa_and_get(vcpu, tt, tces[i],&pg); -> if (hpa = ERROR_ADDR) { +> if (hpa == ERROR_ADDR) { > vcpu->arch.tce_tmp_num = i; > vcpu->arch.tce_rm_fail = TCERM_GETPAGE; > @@ -342,7 +357,7 @@ long kvmppc_h_put_tce_indirect(struct kvm_vcpu *vcpu, @@ -385,6 +385,6 @@ Alex > > - tces = kvmppc_rm_gpa_to_hpa_and_get(vcpu, tce_list,&pg); > + tces = kvmppc_rm_gpa_to_hpa_and_get(vcpu, tt, tce_list,&pg); -> if (tces = ERROR_ADDR) +> if (tces == ERROR_ADDR) > return H_TOO_HARD; > diff --git a/a/content_digest b/N1/content_digest index b4efc67..308a6e7 100644 --- a/a/content_digest +++ b/N1/content_digest @@ -2,16 +2,15 @@ "ref\01373123227-22969-9-git-send-email-aik@ozlabs.ru\0" "From\0Alexander Graf <agraf@suse.de>\0" "Subject\0Re: [PATCH 8/8] KVM: PPC: Add hugepage support for IOMMU in-kernel handling\0" - "Date\0Tue, 09 Jul 2013 17:32:19 +0000\0" + "Date\0Tue, 09 Jul 2013 19:32:19 +0200\0" "To\0Alexey Kardashevskiy <aik@ozlabs.ru>\0" - "Cc\0linuxppc-dev@lists.ozlabs.org" - David Gibson <david@gibson.dropbear.id.au> - Benjamin Herrenschmidt <benh@kernel.crashing.org> - Paul Mackerras <paulus@samba.org> - Alex Williamson <alex.williamson@redhat.com> - kvm@vger.kernel.org + "Cc\0kvm@vger.kernel.org" linux-kernel@vger.kernel.org - " kvm-ppc@vger.kernel.org\0" + kvm-ppc@vger.kernel.org + Alex Williamson <alex.williamson@redhat.com> + Paul Mackerras <paulus@samba.org> + linuxppc-dev@lists.ozlabs.org + " David Gibson <david@gibson.dropbear.id.au>\0" "\00:1\0" "b\0" "On 07/06/2013 05:07 PM, Alexey Kardashevskiy wrote:\n" @@ -296,7 +295,7 @@ ">\n" "> -\t\thva = kvmppc_vm_gpa_to_hva_and_get(vcpu, tce,&pg,&hpa);\n" "> +\t\thva = kvmppc_vm_gpa_to_hva_and_get(vcpu, tt, tce,&pg,&hpa);\n" - "> \t\tif (hva = ERROR_ADDR)\n" + "> \t\tif (hva == ERROR_ADDR)\n" "> \t\t\treturn H_HARDWARE;\n" "> \t}\n" "> @@ -372,7 +464,7 @@ long kvmppc_vm_h_put_tce_iommu(struct kvm_vcpu *vcpu,\n" @@ -315,7 +314,7 @@ "> -\t\thva = kvmppc_vm_gpa_to_hva_and_get(vcpu, gpa,&pg,\n" "> +\t\thva = kvmppc_vm_gpa_to_hva_and_get(vcpu, tt, gpa,&pg,\n" "> \t\t\t\t&vcpu->arch.tce_tmp_hpas[i]);\n" - "> \t\tif (hva = ERROR_ADDR)\n" + "> \t\tif (hva == ERROR_ADDR)\n" "> \t\t\tgoto putpages_flush_exit;\n" "> @@ -429,7 +521,7 @@ putpages_flush_exit:\n" "> \tfor ( --i; i>= 0; --i) {\n" @@ -332,7 +331,7 @@ ">\n" "> -\ttces = kvmppc_vm_gpa_to_hva_and_get(vcpu, tce_list,&pg, NULL);\n" "> +\ttces = kvmppc_vm_gpa_to_hva_and_get(vcpu, tt, tce_list,&pg, NULL);\n" - "> \tif (tces = ERROR_ADDR)\n" + "> \tif (tces == ERROR_ADDR)\n" "> \t\treturn H_TOO_HARD;\n" ">\n" "> @@ -547,7 +639,7 @@ long kvmppc_vm_h_put_tce_indirect(struct kvm_vcpu *vcpu,\n" @@ -383,7 +382,7 @@ ">\n" "> -\thpa = kvmppc_rm_gpa_to_hpa_and_get(vcpu, tce,&pg);\n" "> +\thpa = kvmppc_rm_gpa_to_hpa_and_get(vcpu, tt, tce,&pg);\n" - "> \tif (hpa = ERROR_ADDR)\n" + "> \tif (hpa == ERROR_ADDR)\n" "> \t\treturn H_TOO_HARD;\n" ">\n" "> @@ -247,7 +262,7 @@ static long kvmppc_h_put_tce_indirect_iommu(struct kvm_vcpu *vcpu,\n" @@ -392,7 +391,7 @@ "> \tfor (i = 0; i< npages; ++i) {\n" "> -\t\thpa = kvmppc_rm_gpa_to_hpa_and_get(vcpu, tces[i],&pg);\n" "> +\t\thpa = kvmppc_rm_gpa_to_hpa_and_get(vcpu, tt, tces[i],&pg);\n" - "> \t\tif (hpa = ERROR_ADDR) {\n" + "> \t\tif (hpa == ERROR_ADDR) {\n" "> \t\t\tvcpu->arch.tce_tmp_num = i;\n" "> \t\t\tvcpu->arch.tce_rm_fail = TCERM_GETPAGE;\n" "> @@ -342,7 +357,7 @@ long kvmppc_h_put_tce_indirect(struct kvm_vcpu *vcpu,\n" @@ -401,8 +400,8 @@ ">\n" "> -\ttces = kvmppc_rm_gpa_to_hpa_and_get(vcpu, tce_list,&pg);\n" "> +\ttces = kvmppc_rm_gpa_to_hpa_and_get(vcpu, tt, tce_list,&pg);\n" - "> \tif (tces = ERROR_ADDR)\n" + "> \tif (tces == ERROR_ADDR)\n" "> \t\treturn H_TOO_HARD;\n" > -89511ce748057f6f97e7a4ff8940df1d7224750b879d778ac85a7a76c4520977 +2dd8dd2b8b80024625662daf815e04beb19a335e6e34c3f4ded68d569289326c
diff --git a/a/1.txt b/N2/1.txt index 1e64ba2..7496827 100644 --- a/a/1.txt +++ b/N2/1.txt @@ -280,7 +280,7 @@ Alex > > - hva = kvmppc_vm_gpa_to_hva_and_get(vcpu, tce,&pg,&hpa); > + hva = kvmppc_vm_gpa_to_hva_and_get(vcpu, tt, tce,&pg,&hpa); -> if (hva = ERROR_ADDR) +> if (hva == ERROR_ADDR) > return H_HARDWARE; > } > @@ -372,7 +464,7 @@ long kvmppc_vm_h_put_tce_iommu(struct kvm_vcpu *vcpu, @@ -299,7 +299,7 @@ Alex > - hva = kvmppc_vm_gpa_to_hva_and_get(vcpu, gpa,&pg, > + hva = kvmppc_vm_gpa_to_hva_and_get(vcpu, tt, gpa,&pg, > &vcpu->arch.tce_tmp_hpas[i]); -> if (hva = ERROR_ADDR) +> if (hva == ERROR_ADDR) > goto putpages_flush_exit; > @@ -429,7 +521,7 @@ putpages_flush_exit: > for ( --i; i>= 0; --i) { @@ -316,7 +316,7 @@ Alex > > - tces = kvmppc_vm_gpa_to_hva_and_get(vcpu, tce_list,&pg, NULL); > + tces = kvmppc_vm_gpa_to_hva_and_get(vcpu, tt, tce_list,&pg, NULL); -> if (tces = ERROR_ADDR) +> if (tces == ERROR_ADDR) > return H_TOO_HARD; > > @@ -547,7 +639,7 @@ long kvmppc_vm_h_put_tce_indirect(struct kvm_vcpu *vcpu, @@ -367,7 +367,7 @@ Alex > > - hpa = kvmppc_rm_gpa_to_hpa_and_get(vcpu, tce,&pg); > + hpa = kvmppc_rm_gpa_to_hpa_and_get(vcpu, tt, tce,&pg); -> if (hpa = ERROR_ADDR) +> if (hpa == ERROR_ADDR) > return H_TOO_HARD; > > @@ -247,7 +262,7 @@ static long kvmppc_h_put_tce_indirect_iommu(struct kvm_vcpu *vcpu, @@ -376,7 +376,7 @@ Alex > for (i = 0; i< npages; ++i) { > - hpa = kvmppc_rm_gpa_to_hpa_and_get(vcpu, tces[i],&pg); > + hpa = kvmppc_rm_gpa_to_hpa_and_get(vcpu, tt, tces[i],&pg); -> if (hpa = ERROR_ADDR) { +> if (hpa == ERROR_ADDR) { > vcpu->arch.tce_tmp_num = i; > vcpu->arch.tce_rm_fail = TCERM_GETPAGE; > @@ -342,7 +357,7 @@ long kvmppc_h_put_tce_indirect(struct kvm_vcpu *vcpu, @@ -385,6 +385,6 @@ Alex > > - tces = kvmppc_rm_gpa_to_hpa_and_get(vcpu, tce_list,&pg); > + tces = kvmppc_rm_gpa_to_hpa_and_get(vcpu, tt, tce_list,&pg); -> if (tces = ERROR_ADDR) +> if (tces == ERROR_ADDR) > return H_TOO_HARD; > diff --git a/a/content_digest b/N2/content_digest index b4efc67..a02b749 100644 --- a/a/content_digest +++ b/N2/content_digest @@ -2,7 +2,7 @@ "ref\01373123227-22969-9-git-send-email-aik@ozlabs.ru\0" "From\0Alexander Graf <agraf@suse.de>\0" "Subject\0Re: [PATCH 8/8] KVM: PPC: Add hugepage support for IOMMU in-kernel handling\0" - "Date\0Tue, 09 Jul 2013 17:32:19 +0000\0" + "Date\0Tue, 09 Jul 2013 19:32:19 +0200\0" "To\0Alexey Kardashevskiy <aik@ozlabs.ru>\0" "Cc\0linuxppc-dev@lists.ozlabs.org" David Gibson <david@gibson.dropbear.id.au> @@ -296,7 +296,7 @@ ">\n" "> -\t\thva = kvmppc_vm_gpa_to_hva_and_get(vcpu, tce,&pg,&hpa);\n" "> +\t\thva = kvmppc_vm_gpa_to_hva_and_get(vcpu, tt, tce,&pg,&hpa);\n" - "> \t\tif (hva = ERROR_ADDR)\n" + "> \t\tif (hva == ERROR_ADDR)\n" "> \t\t\treturn H_HARDWARE;\n" "> \t}\n" "> @@ -372,7 +464,7 @@ long kvmppc_vm_h_put_tce_iommu(struct kvm_vcpu *vcpu,\n" @@ -315,7 +315,7 @@ "> -\t\thva = kvmppc_vm_gpa_to_hva_and_get(vcpu, gpa,&pg,\n" "> +\t\thva = kvmppc_vm_gpa_to_hva_and_get(vcpu, tt, gpa,&pg,\n" "> \t\t\t\t&vcpu->arch.tce_tmp_hpas[i]);\n" - "> \t\tif (hva = ERROR_ADDR)\n" + "> \t\tif (hva == ERROR_ADDR)\n" "> \t\t\tgoto putpages_flush_exit;\n" "> @@ -429,7 +521,7 @@ putpages_flush_exit:\n" "> \tfor ( --i; i>= 0; --i) {\n" @@ -332,7 +332,7 @@ ">\n" "> -\ttces = kvmppc_vm_gpa_to_hva_and_get(vcpu, tce_list,&pg, NULL);\n" "> +\ttces = kvmppc_vm_gpa_to_hva_and_get(vcpu, tt, tce_list,&pg, NULL);\n" - "> \tif (tces = ERROR_ADDR)\n" + "> \tif (tces == ERROR_ADDR)\n" "> \t\treturn H_TOO_HARD;\n" ">\n" "> @@ -547,7 +639,7 @@ long kvmppc_vm_h_put_tce_indirect(struct kvm_vcpu *vcpu,\n" @@ -383,7 +383,7 @@ ">\n" "> -\thpa = kvmppc_rm_gpa_to_hpa_and_get(vcpu, tce,&pg);\n" "> +\thpa = kvmppc_rm_gpa_to_hpa_and_get(vcpu, tt, tce,&pg);\n" - "> \tif (hpa = ERROR_ADDR)\n" + "> \tif (hpa == ERROR_ADDR)\n" "> \t\treturn H_TOO_HARD;\n" ">\n" "> @@ -247,7 +262,7 @@ static long kvmppc_h_put_tce_indirect_iommu(struct kvm_vcpu *vcpu,\n" @@ -392,7 +392,7 @@ "> \tfor (i = 0; i< npages; ++i) {\n" "> -\t\thpa = kvmppc_rm_gpa_to_hpa_and_get(vcpu, tces[i],&pg);\n" "> +\t\thpa = kvmppc_rm_gpa_to_hpa_and_get(vcpu, tt, tces[i],&pg);\n" - "> \t\tif (hpa = ERROR_ADDR) {\n" + "> \t\tif (hpa == ERROR_ADDR) {\n" "> \t\t\tvcpu->arch.tce_tmp_num = i;\n" "> \t\t\tvcpu->arch.tce_rm_fail = TCERM_GETPAGE;\n" "> @@ -342,7 +357,7 @@ long kvmppc_h_put_tce_indirect(struct kvm_vcpu *vcpu,\n" @@ -401,8 +401,8 @@ ">\n" "> -\ttces = kvmppc_rm_gpa_to_hpa_and_get(vcpu, tce_list,&pg);\n" "> +\ttces = kvmppc_rm_gpa_to_hpa_and_get(vcpu, tt, tce_list,&pg);\n" - "> \tif (tces = ERROR_ADDR)\n" + "> \tif (tces == ERROR_ADDR)\n" "> \t\treturn H_TOO_HARD;\n" > -89511ce748057f6f97e7a4ff8940df1d7224750b879d778ac85a7a76c4520977 +535bb608f579e6774b2e5c282eb38e2e8391d9282cbeb69dac6efe71834ddd59
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.