diff for duplicates of <1371356450.21896.108.camel@pasglop> diff --git a/a/1.txt b/N1/1.txt index 81ac788..8a677b0 100644 --- a/a/1.txt +++ b/N1/1.txt @@ -216,7 +216,7 @@ On Wed, 2013-06-05 at 16:11 +1000, Alexey Kardashevskiy wrote: > + return H_PARAMETER; > + > + tces = kvmppc_virtmode_gpa_to_hva(vcpu, tce_list); -> + if (tces = ERROR_ADDR) +> + if (tces == ERROR_ADDR) > + return H_TOO_HARD; > + > + /* Emulated IO */ @@ -296,7 +296,7 @@ On Wed, 2013-06-05 at 16:11 +1000, Alexey Kardashevskiy wrote: > + 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; > + } > + @@ -476,7 +476,7 @@ specific case, but still. > - /* 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; @@ -539,7 +539,7 @@ specific case, but still. > + return H_PARAMETER; > + > + tces = (unsigned long *) kvmppc_realmode_gpa_to_hpa(vcpu, tce_list); -> + if ((unsigned long)tces = ERROR_ADDR) +> + if ((unsigned long)tces == ERROR_ADDR) > + return H_TOO_HARD; > + > + /* Emulated IO */ @@ -600,7 +600,7 @@ specific case, but still. > + ret = kvmppc_virtmode_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: @@ -608,7 +608,7 @@ specific case, but still. > + 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: @@ -616,7 +616,7 @@ specific case, but still. > + 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: @@ -678,7 +678,7 @@ specific case, but still. > > - rc = kvmppc_h_put_tce(vcpu, liobn, ioba, tce); > + rc = kvmppc_virtmode_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; @@ -694,7 +694,7 @@ specific case, but still. > + > + rc = kvmppc_virtmode_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; @@ -709,7 +709,7 @@ specific case, but still. > + long rc; > + > + rc = kvmppc_virtmode_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 f16f896..034f5e5 100644 --- a/a/content_digest +++ b/N1/content_digest @@ -2,15 +2,15 @@ "ref\01370412673-1345-2-git-send-email-aik@ozlabs.ru\0" "From\0Benjamin Herrenschmidt <benh@kernel.crashing.org>\0" "Subject\0Re: [PATCH 1/4] KVM: PPC: Add support for multiple-TCE hcalls\0" - "Date\0Sun, 16 Jun 2013 04:20:50 +0000\0" + "Date\0Sun, 16 Jun 2013 14:20:50 +1000\0" "To\0Alexey Kardashevskiy <aik@ozlabs.ru>\0" - "Cc\0linuxppc-dev@lists.ozlabs.org" - David Gibson <david@gibson.dropbear.id.au> + "Cc\0kvm@vger.kernel.org" + linux-kernel@vger.kernel.org + kvm-ppc@vger.kernel.org Alexander Graf <agraf@suse.de> Paul Mackerras <paulus@samba.org> - kvm@vger.kernel.org - linux-kernel@vger.kernel.org - " kvm-ppc@vger.kernel.org\0" + linuxppc-dev@lists.ozlabs.org + " David Gibson <david@gibson.dropbear.id.au>\0" "\00:1\0" "b\0" "On Wed, 2013-06-05 at 16:11 +1000, Alexey Kardashevskiy wrote:\n" @@ -231,7 +231,7 @@ "> +\t\treturn H_PARAMETER;\n" "> +\n" "> +\ttces = kvmppc_virtmode_gpa_to_hva(vcpu, tce_list);\n" - "> +\tif (tces = ERROR_ADDR)\n" + "> +\tif (tces == ERROR_ADDR)\n" "> +\t\treturn H_TOO_HARD;\n" "> +\n" "> +\t/* Emulated IO */\n" @@ -311,7 +311,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" @@ -491,7 +491,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" @@ -554,7 +554,7 @@ "> +\t\treturn H_PARAMETER;\n" "> +\n" "> +\ttces = (unsigned long *) kvmppc_realmode_gpa_to_hpa(vcpu, tce_list);\n" - "> +\tif ((unsigned long)tces = ERROR_ADDR)\n" + "> +\tif ((unsigned long)tces == ERROR_ADDR)\n" "> +\t\treturn H_TOO_HARD;\n" "> +\n" "> +\t/* Emulated IO */\n" @@ -615,7 +615,7 @@ "> +\t\tret = kvmppc_virtmode_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" @@ -623,7 +623,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" @@ -631,7 +631,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" @@ -693,7 +693,7 @@ "> \n" "> -\trc = kvmppc_h_put_tce(vcpu, liobn, ioba, tce);\n" "> +\trc = kvmppc_virtmode_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" @@ -709,7 +709,7 @@ "> +\n" "> +\trc = kvmppc_virtmode_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" @@ -724,7 +724,7 @@ "> +\tlong rc;\n" "> +\n" "> +\trc = kvmppc_virtmode_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" @@ -765,4 +765,4 @@ "> #ifdef KVM_CAP_IRQ_ROUTING\n" > -7e73ca8dd0d873b373560f8250fbb51d35ef1601d8a01b2533f5b23bf69389d4 +d8d18814b18eacf0f28360110ecaf53a0bb99368846ea5ae11fdf9bdf41f797b
diff --git a/a/1.txt b/N2/1.txt index 81ac788..8a677b0 100644 --- a/a/1.txt +++ b/N2/1.txt @@ -216,7 +216,7 @@ On Wed, 2013-06-05 at 16:11 +1000, Alexey Kardashevskiy wrote: > + return H_PARAMETER; > + > + tces = kvmppc_virtmode_gpa_to_hva(vcpu, tce_list); -> + if (tces = ERROR_ADDR) +> + if (tces == ERROR_ADDR) > + return H_TOO_HARD; > + > + /* Emulated IO */ @@ -296,7 +296,7 @@ On Wed, 2013-06-05 at 16:11 +1000, Alexey Kardashevskiy wrote: > + 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; > + } > + @@ -476,7 +476,7 @@ specific case, but still. > - /* 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; @@ -539,7 +539,7 @@ specific case, but still. > + return H_PARAMETER; > + > + tces = (unsigned long *) kvmppc_realmode_gpa_to_hpa(vcpu, tce_list); -> + if ((unsigned long)tces = ERROR_ADDR) +> + if ((unsigned long)tces == ERROR_ADDR) > + return H_TOO_HARD; > + > + /* Emulated IO */ @@ -600,7 +600,7 @@ specific case, but still. > + ret = kvmppc_virtmode_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: @@ -608,7 +608,7 @@ specific case, but still. > + 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: @@ -616,7 +616,7 @@ specific case, but still. > + 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: @@ -678,7 +678,7 @@ specific case, but still. > > - rc = kvmppc_h_put_tce(vcpu, liobn, ioba, tce); > + rc = kvmppc_virtmode_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; @@ -694,7 +694,7 @@ specific case, but still. > + > + rc = kvmppc_virtmode_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; @@ -709,7 +709,7 @@ specific case, but still. > + long rc; > + > + rc = kvmppc_virtmode_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 f16f896..f4e732b 100644 --- a/a/content_digest +++ b/N2/content_digest @@ -2,7 +2,7 @@ "ref\01370412673-1345-2-git-send-email-aik@ozlabs.ru\0" "From\0Benjamin Herrenschmidt <benh@kernel.crashing.org>\0" "Subject\0Re: [PATCH 1/4] KVM: PPC: Add support for multiple-TCE hcalls\0" - "Date\0Sun, 16 Jun 2013 04:20:50 +0000\0" + "Date\0Sun, 16 Jun 2013 14:20:50 +1000\0" "To\0Alexey Kardashevskiy <aik@ozlabs.ru>\0" "Cc\0linuxppc-dev@lists.ozlabs.org" David Gibson <david@gibson.dropbear.id.au> @@ -231,7 +231,7 @@ "> +\t\treturn H_PARAMETER;\n" "> +\n" "> +\ttces = kvmppc_virtmode_gpa_to_hva(vcpu, tce_list);\n" - "> +\tif (tces = ERROR_ADDR)\n" + "> +\tif (tces == ERROR_ADDR)\n" "> +\t\treturn H_TOO_HARD;\n" "> +\n" "> +\t/* Emulated IO */\n" @@ -311,7 +311,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" @@ -491,7 +491,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" @@ -554,7 +554,7 @@ "> +\t\treturn H_PARAMETER;\n" "> +\n" "> +\ttces = (unsigned long *) kvmppc_realmode_gpa_to_hpa(vcpu, tce_list);\n" - "> +\tif ((unsigned long)tces = ERROR_ADDR)\n" + "> +\tif ((unsigned long)tces == ERROR_ADDR)\n" "> +\t\treturn H_TOO_HARD;\n" "> +\n" "> +\t/* Emulated IO */\n" @@ -615,7 +615,7 @@ "> +\t\tret = kvmppc_virtmode_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" @@ -623,7 +623,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" @@ -631,7 +631,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" @@ -693,7 +693,7 @@ "> \n" "> -\trc = kvmppc_h_put_tce(vcpu, liobn, ioba, tce);\n" "> +\trc = kvmppc_virtmode_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" @@ -709,7 +709,7 @@ "> +\n" "> +\trc = kvmppc_virtmode_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" @@ -724,7 +724,7 @@ "> +\tlong rc;\n" "> +\n" "> +\trc = kvmppc_virtmode_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" @@ -765,4 +765,4 @@ "> #ifdef KVM_CAP_IRQ_ROUTING\n" > -7e73ca8dd0d873b373560f8250fbb51d35ef1601d8a01b2533f5b23bf69389d4 +ab0a4ce3af736aa8b7bcd2d3742354fcab0318c9426c8beb78549a9230cabceb
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.