diff for duplicates of <51DC4228.7010607@suse.de> diff --git a/a/1.txt b/N1/1.txt index fb0532a..d33dcd2 100644 --- a/a/1.txt +++ b/N1/1.txt @@ -322,10 +322,10 @@ so so? > + return H_PARAMETER; > + > + tces = kvmppc_vm_gpa_to_hva_and_get(vcpu, tce_list,&pg); -> + if (tces = ERROR_ADDR) +> + if (tces == ERROR_ADDR) > + return H_TOO_HARD; > + -> + if (vcpu->arch.tce_rm_fail = TCERM_PUTLIST) +> + if (vcpu->arch.tce_rm_fail == TCERM_PUTLIST) > + goto put_list_page_exit; > + > + for (i = 0; i< npages; ++i) { @@ -417,7 +417,7 @@ What's wrong with the warning? > + struct kvmppc_spapr_tce_table *tt; > + > + list_for_each_entry(tt,&vcpu->kvm->arch.spapr_tce_tables, list) { -> + if (tt->liobn = liobn) +> + if (tt->liobn == liobn) > + return tt; > + } > + @@ -579,7 +579,7 @@ This is not an RFC, is it? > - /* liobn, ioba, tce); */ > - > - list_for_each_entry(stt,&kvm->arch.spapr_tce_tables, list) { -> - if (stt->liobn = liobn) { +> - if (stt->liobn == liobn) { > - unsigned long idx = ioba>> SPAPR_TCE_SHIFT; > - struct page *page; > - u64 *tbl; @@ -651,7 +651,7 @@ Alex > + return H_PARAMETER; > + > + tces = kvmppc_rm_gpa_to_hpa_and_get(vcpu, tce_list,&pg); -> + if (tces = ERROR_ADDR) +> + if (tces == ERROR_ADDR) > + return H_TOO_HARD; > + > + for (i = 0; i< npages; ++i) { @@ -716,7 +716,7 @@ Alex > + ret = kvmppc_vm_h_put_tce(vcpu, kvmppc_get_gpr(vcpu, 4), > + kvmppc_get_gpr(vcpu, 5), > + kvmppc_get_gpr(vcpu, 6)); -> + if (ret = H_TOO_HARD) +> + if (ret == H_TOO_HARD) > + return RESUME_HOST; > + break; > + case H_PUT_TCE_INDIRECT: @@ -724,7 +724,7 @@ Alex > + kvmppc_get_gpr(vcpu, 5), > + kvmppc_get_gpr(vcpu, 6), > + kvmppc_get_gpr(vcpu, 7)); -> + if (ret = H_TOO_HARD) +> + if (ret == H_TOO_HARD) > + return RESUME_HOST; > + break; > + case H_STUFF_TCE: @@ -732,7 +732,7 @@ Alex > + kvmppc_get_gpr(vcpu, 5), > + kvmppc_get_gpr(vcpu, 6), > + kvmppc_get_gpr(vcpu, 7)); -> + if (ret = H_TOO_HARD) +> + if (ret == H_TOO_HARD) > + return RESUME_HOST; > + break; > default: @@ -794,7 +794,7 @@ Alex > > - rc = kvmppc_h_put_tce(vcpu, liobn, ioba, tce); > + rc = kvmppc_vm_h_put_tce(vcpu, liobn, ioba, tce); -> + if (rc = H_TOO_HARD) +> + if (rc == H_TOO_HARD) > + return EMULATE_FAIL; > + kvmppc_set_gpr(vcpu, 3, rc); > + return EMULATE_DONE; @@ -810,7 +810,7 @@ Alex > + > + rc = kvmppc_vm_h_put_tce_indirect(vcpu, liobn, ioba, > + tce, npages); -> + if (rc = H_TOO_HARD) +> + if (rc == H_TOO_HARD) > + return EMULATE_FAIL; > + kvmppc_set_gpr(vcpu, 3, rc); > + return EMULATE_DONE; @@ -825,7 +825,7 @@ Alex > + long rc; > + > + rc = kvmppc_vm_h_stuff_tce(vcpu, liobn, ioba, tce_value, npages); -> if (rc = H_TOO_HARD) +> if (rc == H_TOO_HARD) > return EMULATE_FAIL; > kvmppc_set_gpr(vcpu, 3, rc); > @@ -247,6 +278,10 @@ int kvmppc_h_pr(struct kvm_vcpu *vcpu, unsigned long cmd) diff --git a/a/content_digest b/N1/content_digest index 2064aec..9ae3398 100644 --- a/a/content_digest +++ b/N1/content_digest @@ -2,16 +2,15 @@ "ref\01373123227-22969-7-git-send-email-aik@ozlabs.ru\0" "From\0Alexander Graf <agraf@suse.de>\0" "Subject\0Re: [PATCH 6/8] KVM: PPC: Add support for multiple-TCE hcalls\0" - "Date\0Tue, 09 Jul 2013 17:02:32 +0000\0" + "Date\0Tue, 09 Jul 2013 19:02:32 +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" @@ -338,10 +337,10 @@ "> +\t\treturn H_PARAMETER;\n" "> +\n" "> +\ttces = kvmppc_vm_gpa_to_hva_and_get(vcpu, tce_list,&pg);\n" - "> +\tif (tces = ERROR_ADDR)\n" + "> +\tif (tces == ERROR_ADDR)\n" "> +\t\treturn H_TOO_HARD;\n" "> +\n" - "> +\tif (vcpu->arch.tce_rm_fail = TCERM_PUTLIST)\n" + "> +\tif (vcpu->arch.tce_rm_fail == TCERM_PUTLIST)\n" "> +\t\tgoto put_list_page_exit;\n" "> +\n" "> +\tfor (i = 0; i< npages; ++i) {\n" @@ -433,7 +432,7 @@ "> +\tstruct kvmppc_spapr_tce_table *tt;\n" "> +\n" "> +\tlist_for_each_entry(tt,&vcpu->kvm->arch.spapr_tce_tables, list) {\n" - "> +\t\tif (tt->liobn = liobn)\n" + "> +\t\tif (tt->liobn == liobn)\n" "> +\t\t\treturn tt;\n" "> +\t}\n" "> +\n" @@ -595,7 +594,7 @@ "> -\t/* \t liobn, ioba, tce); */\n" "> -\n" "> -\tlist_for_each_entry(stt,&kvm->arch.spapr_tce_tables, list) {\n" - "> -\t\tif (stt->liobn = liobn) {\n" + "> -\t\tif (stt->liobn == liobn) {\n" "> -\t\t\tunsigned long idx = ioba>> SPAPR_TCE_SHIFT;\n" "> -\t\t\tstruct page *page;\n" "> -\t\t\tu64 *tbl;\n" @@ -667,7 +666,7 @@ "> +\t\treturn H_PARAMETER;\n" "> +\n" "> +\ttces = kvmppc_rm_gpa_to_hpa_and_get(vcpu, tce_list,&pg);\n" - "> +\tif (tces = ERROR_ADDR)\n" + "> +\tif (tces == ERROR_ADDR)\n" "> +\t\treturn H_TOO_HARD;\n" "> +\n" "> +\tfor (i = 0; i< npages; ++i) {\n" @@ -732,7 +731,7 @@ "> +\t\tret = kvmppc_vm_h_put_tce(vcpu, kvmppc_get_gpr(vcpu, 4),\n" "> +\t\t\t\t\t\tkvmppc_get_gpr(vcpu, 5),\n" "> +\t\t\t\t\t\tkvmppc_get_gpr(vcpu, 6));\n" - "> +\t\tif (ret = H_TOO_HARD)\n" + "> +\t\tif (ret == H_TOO_HARD)\n" "> +\t\t\treturn RESUME_HOST;\n" "> +\t\tbreak;\n" "> +\tcase H_PUT_TCE_INDIRECT:\n" @@ -740,7 +739,7 @@ "> +\t\t\t\t\t\tkvmppc_get_gpr(vcpu, 5),\n" "> +\t\t\t\t\t\tkvmppc_get_gpr(vcpu, 6),\n" "> +\t\t\t\t\t\tkvmppc_get_gpr(vcpu, 7));\n" - "> +\t\tif (ret = H_TOO_HARD)\n" + "> +\t\tif (ret == H_TOO_HARD)\n" "> +\t\t\treturn RESUME_HOST;\n" "> +\t\tbreak;\n" "> +\tcase H_STUFF_TCE:\n" @@ -748,7 +747,7 @@ "> +\t\t\t\t\t\tkvmppc_get_gpr(vcpu, 5),\n" "> +\t\t\t\t\t\tkvmppc_get_gpr(vcpu, 6),\n" "> +\t\t\t\t\t\tkvmppc_get_gpr(vcpu, 7));\n" - "> +\t\tif (ret = H_TOO_HARD)\n" + "> +\t\tif (ret == H_TOO_HARD)\n" "> +\t\t\treturn RESUME_HOST;\n" "> +\t\tbreak;\n" "> \tdefault:\n" @@ -810,7 +809,7 @@ ">\n" "> -\trc = kvmppc_h_put_tce(vcpu, liobn, ioba, tce);\n" "> +\trc = kvmppc_vm_h_put_tce(vcpu, liobn, ioba, tce);\n" - "> +\tif (rc = H_TOO_HARD)\n" + "> +\tif (rc == H_TOO_HARD)\n" "> +\t\treturn EMULATE_FAIL;\n" "> +\tkvmppc_set_gpr(vcpu, 3, rc);\n" "> +\treturn EMULATE_DONE;\n" @@ -826,7 +825,7 @@ "> +\n" "> +\trc = kvmppc_vm_h_put_tce_indirect(vcpu, liobn, ioba,\n" "> +\t\t\ttce, npages);\n" - "> +\tif (rc = H_TOO_HARD)\n" + "> +\tif (rc == H_TOO_HARD)\n" "> +\t\treturn EMULATE_FAIL;\n" "> +\tkvmppc_set_gpr(vcpu, 3, rc);\n" "> +\treturn EMULATE_DONE;\n" @@ -841,7 +840,7 @@ "> +\tlong rc;\n" "> +\n" "> +\trc = kvmppc_vm_h_stuff_tce(vcpu, liobn, ioba, tce_value, npages);\n" - "> \tif (rc = H_TOO_HARD)\n" + "> \tif (rc == H_TOO_HARD)\n" "> \t\treturn EMULATE_FAIL;\n" "> \tkvmppc_set_gpr(vcpu, 3, rc);\n" "> @@ -247,6 +278,10 @@ int kvmppc_h_pr(struct kvm_vcpu *vcpu, unsigned long cmd)\n" @@ -870,4 +869,4 @@ "> \tdefault:\n" "> \t\tr = 0;" -3fb4757dad53ecfeeb172f6247d481fe2413da2d664eccdeb2173e60f0296053 +3921037cf967b1323c2fcdab477eaa9214fa26ff097039aeda3c44533b590442
diff --git a/a/1.txt b/N2/1.txt index fb0532a..d33dcd2 100644 --- a/a/1.txt +++ b/N2/1.txt @@ -322,10 +322,10 @@ so so? > + return H_PARAMETER; > + > + tces = kvmppc_vm_gpa_to_hva_and_get(vcpu, tce_list,&pg); -> + if (tces = ERROR_ADDR) +> + if (tces == ERROR_ADDR) > + return H_TOO_HARD; > + -> + if (vcpu->arch.tce_rm_fail = TCERM_PUTLIST) +> + if (vcpu->arch.tce_rm_fail == TCERM_PUTLIST) > + goto put_list_page_exit; > + > + for (i = 0; i< npages; ++i) { @@ -417,7 +417,7 @@ What's wrong with the warning? > + struct kvmppc_spapr_tce_table *tt; > + > + list_for_each_entry(tt,&vcpu->kvm->arch.spapr_tce_tables, list) { -> + if (tt->liobn = liobn) +> + if (tt->liobn == liobn) > + return tt; > + } > + @@ -579,7 +579,7 @@ This is not an RFC, is it? > - /* liobn, ioba, tce); */ > - > - list_for_each_entry(stt,&kvm->arch.spapr_tce_tables, list) { -> - if (stt->liobn = liobn) { +> - if (stt->liobn == liobn) { > - unsigned long idx = ioba>> SPAPR_TCE_SHIFT; > - struct page *page; > - u64 *tbl; @@ -651,7 +651,7 @@ Alex > + return H_PARAMETER; > + > + tces = kvmppc_rm_gpa_to_hpa_and_get(vcpu, tce_list,&pg); -> + if (tces = ERROR_ADDR) +> + if (tces == ERROR_ADDR) > + return H_TOO_HARD; > + > + for (i = 0; i< npages; ++i) { @@ -716,7 +716,7 @@ Alex > + ret = kvmppc_vm_h_put_tce(vcpu, kvmppc_get_gpr(vcpu, 4), > + kvmppc_get_gpr(vcpu, 5), > + kvmppc_get_gpr(vcpu, 6)); -> + if (ret = H_TOO_HARD) +> + if (ret == H_TOO_HARD) > + return RESUME_HOST; > + break; > + case H_PUT_TCE_INDIRECT: @@ -724,7 +724,7 @@ Alex > + kvmppc_get_gpr(vcpu, 5), > + kvmppc_get_gpr(vcpu, 6), > + kvmppc_get_gpr(vcpu, 7)); -> + if (ret = H_TOO_HARD) +> + if (ret == H_TOO_HARD) > + return RESUME_HOST; > + break; > + case H_STUFF_TCE: @@ -732,7 +732,7 @@ Alex > + kvmppc_get_gpr(vcpu, 5), > + kvmppc_get_gpr(vcpu, 6), > + kvmppc_get_gpr(vcpu, 7)); -> + if (ret = H_TOO_HARD) +> + if (ret == H_TOO_HARD) > + return RESUME_HOST; > + break; > default: @@ -794,7 +794,7 @@ Alex > > - rc = kvmppc_h_put_tce(vcpu, liobn, ioba, tce); > + rc = kvmppc_vm_h_put_tce(vcpu, liobn, ioba, tce); -> + if (rc = H_TOO_HARD) +> + if (rc == H_TOO_HARD) > + return EMULATE_FAIL; > + kvmppc_set_gpr(vcpu, 3, rc); > + return EMULATE_DONE; @@ -810,7 +810,7 @@ Alex > + > + rc = kvmppc_vm_h_put_tce_indirect(vcpu, liobn, ioba, > + tce, npages); -> + if (rc = H_TOO_HARD) +> + if (rc == H_TOO_HARD) > + return EMULATE_FAIL; > + kvmppc_set_gpr(vcpu, 3, rc); > + return EMULATE_DONE; @@ -825,7 +825,7 @@ Alex > + long rc; > + > + rc = kvmppc_vm_h_stuff_tce(vcpu, liobn, ioba, tce_value, npages); -> if (rc = H_TOO_HARD) +> if (rc == H_TOO_HARD) > return EMULATE_FAIL; > kvmppc_set_gpr(vcpu, 3, rc); > @@ -247,6 +278,10 @@ int kvmppc_h_pr(struct kvm_vcpu *vcpu, unsigned long cmd) diff --git a/a/content_digest b/N2/content_digest index 2064aec..ac5e6e6 100644 --- a/a/content_digest +++ b/N2/content_digest @@ -2,7 +2,7 @@ "ref\01373123227-22969-7-git-send-email-aik@ozlabs.ru\0" "From\0Alexander Graf <agraf@suse.de>\0" "Subject\0Re: [PATCH 6/8] KVM: PPC: Add support for multiple-TCE hcalls\0" - "Date\0Tue, 09 Jul 2013 17:02:32 +0000\0" + "Date\0Tue, 09 Jul 2013 19:02:32 +0200\0" "To\0Alexey Kardashevskiy <aik@ozlabs.ru>\0" "Cc\0linuxppc-dev@lists.ozlabs.org" David Gibson <david@gibson.dropbear.id.au> @@ -338,10 +338,10 @@ "> +\t\treturn H_PARAMETER;\n" "> +\n" "> +\ttces = kvmppc_vm_gpa_to_hva_and_get(vcpu, tce_list,&pg);\n" - "> +\tif (tces = ERROR_ADDR)\n" + "> +\tif (tces == ERROR_ADDR)\n" "> +\t\treturn H_TOO_HARD;\n" "> +\n" - "> +\tif (vcpu->arch.tce_rm_fail = TCERM_PUTLIST)\n" + "> +\tif (vcpu->arch.tce_rm_fail == TCERM_PUTLIST)\n" "> +\t\tgoto put_list_page_exit;\n" "> +\n" "> +\tfor (i = 0; i< npages; ++i) {\n" @@ -433,7 +433,7 @@ "> +\tstruct kvmppc_spapr_tce_table *tt;\n" "> +\n" "> +\tlist_for_each_entry(tt,&vcpu->kvm->arch.spapr_tce_tables, list) {\n" - "> +\t\tif (tt->liobn = liobn)\n" + "> +\t\tif (tt->liobn == liobn)\n" "> +\t\t\treturn tt;\n" "> +\t}\n" "> +\n" @@ -595,7 +595,7 @@ "> -\t/* \t liobn, ioba, tce); */\n" "> -\n" "> -\tlist_for_each_entry(stt,&kvm->arch.spapr_tce_tables, list) {\n" - "> -\t\tif (stt->liobn = liobn) {\n" + "> -\t\tif (stt->liobn == liobn) {\n" "> -\t\t\tunsigned long idx = ioba>> SPAPR_TCE_SHIFT;\n" "> -\t\t\tstruct page *page;\n" "> -\t\t\tu64 *tbl;\n" @@ -667,7 +667,7 @@ "> +\t\treturn H_PARAMETER;\n" "> +\n" "> +\ttces = kvmppc_rm_gpa_to_hpa_and_get(vcpu, tce_list,&pg);\n" - "> +\tif (tces = ERROR_ADDR)\n" + "> +\tif (tces == ERROR_ADDR)\n" "> +\t\treturn H_TOO_HARD;\n" "> +\n" "> +\tfor (i = 0; i< npages; ++i) {\n" @@ -732,7 +732,7 @@ "> +\t\tret = kvmppc_vm_h_put_tce(vcpu, kvmppc_get_gpr(vcpu, 4),\n" "> +\t\t\t\t\t\tkvmppc_get_gpr(vcpu, 5),\n" "> +\t\t\t\t\t\tkvmppc_get_gpr(vcpu, 6));\n" - "> +\t\tif (ret = H_TOO_HARD)\n" + "> +\t\tif (ret == H_TOO_HARD)\n" "> +\t\t\treturn RESUME_HOST;\n" "> +\t\tbreak;\n" "> +\tcase H_PUT_TCE_INDIRECT:\n" @@ -740,7 +740,7 @@ "> +\t\t\t\t\t\tkvmppc_get_gpr(vcpu, 5),\n" "> +\t\t\t\t\t\tkvmppc_get_gpr(vcpu, 6),\n" "> +\t\t\t\t\t\tkvmppc_get_gpr(vcpu, 7));\n" - "> +\t\tif (ret = H_TOO_HARD)\n" + "> +\t\tif (ret == H_TOO_HARD)\n" "> +\t\t\treturn RESUME_HOST;\n" "> +\t\tbreak;\n" "> +\tcase H_STUFF_TCE:\n" @@ -748,7 +748,7 @@ "> +\t\t\t\t\t\tkvmppc_get_gpr(vcpu, 5),\n" "> +\t\t\t\t\t\tkvmppc_get_gpr(vcpu, 6),\n" "> +\t\t\t\t\t\tkvmppc_get_gpr(vcpu, 7));\n" - "> +\t\tif (ret = H_TOO_HARD)\n" + "> +\t\tif (ret == H_TOO_HARD)\n" "> +\t\t\treturn RESUME_HOST;\n" "> +\t\tbreak;\n" "> \tdefault:\n" @@ -810,7 +810,7 @@ ">\n" "> -\trc = kvmppc_h_put_tce(vcpu, liobn, ioba, tce);\n" "> +\trc = kvmppc_vm_h_put_tce(vcpu, liobn, ioba, tce);\n" - "> +\tif (rc = H_TOO_HARD)\n" + "> +\tif (rc == H_TOO_HARD)\n" "> +\t\treturn EMULATE_FAIL;\n" "> +\tkvmppc_set_gpr(vcpu, 3, rc);\n" "> +\treturn EMULATE_DONE;\n" @@ -826,7 +826,7 @@ "> +\n" "> +\trc = kvmppc_vm_h_put_tce_indirect(vcpu, liobn, ioba,\n" "> +\t\t\ttce, npages);\n" - "> +\tif (rc = H_TOO_HARD)\n" + "> +\tif (rc == H_TOO_HARD)\n" "> +\t\treturn EMULATE_FAIL;\n" "> +\tkvmppc_set_gpr(vcpu, 3, rc);\n" "> +\treturn EMULATE_DONE;\n" @@ -841,7 +841,7 @@ "> +\tlong rc;\n" "> +\n" "> +\trc = kvmppc_vm_h_stuff_tce(vcpu, liobn, ioba, tce_value, npages);\n" - "> \tif (rc = H_TOO_HARD)\n" + "> \tif (rc == H_TOO_HARD)\n" "> \t\treturn EMULATE_FAIL;\n" "> \tkvmppc_set_gpr(vcpu, 3, rc);\n" "> @@ -247,6 +278,10 @@ int kvmppc_h_pr(struct kvm_vcpu *vcpu, unsigned long cmd)\n" @@ -870,4 +870,4 @@ "> \tdefault:\n" "> \t\tr = 0;" -3fb4757dad53ecfeeb172f6247d481fe2413da2d664eccdeb2173e60f0296053 +78daac19aabdd732769b9fa779f1154f53fe0a6eb86fab11ae6677b1fd530295
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.