diff for duplicates of <5118e064.22ca320a.1f08.ffffe2ec@mx.google.com> diff --git a/a/1.txt b/N1/1.txt index 4282fc5..bcc6257 100644 --- a/a/1.txt +++ b/N1/1.txt @@ -90,7 +90,7 @@ index 30c2f3b..c38edcd 100644 + struct kvmppc_spapr_tce_table *stt; + + list_for_each_entry(stt, &vcpu->kvm->arch.spapr_tce_tables, list) { -+ if (stt->liobn = liobn) ++ if (stt->liobn == liobn) + return stt; + } + @@ -241,7 +241,7 @@ index 30c2f3b..c38edcd 100644 + return H_TOO_HARD; - 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; @@ -343,7 +343,7 @@ index 71d0c90..13c8436 100644 + 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: @@ -351,7 +351,7 @@ index 71d0c90..13c8436 100644 + 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: @@ -359,7 +359,7 @@ index 71d0c90..13c8436 100644 + 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: @@ -392,7 +392,7 @@ index ee02b30..270e88e 100644 - rc = kvmppc_h_put_tce(vcpu, liobn, ioba, tce); + rc = kvmppc_virtmode_h_put_tce(vcpu, liobn, ioba, tce, 1); -+ if (rc = H_TOO_HARD) ++ if (rc == H_TOO_HARD) + return EMULATE_FAIL; + kvmppc_set_gpr(vcpu, 3, rc); + return EMULATE_DONE; @@ -408,7 +408,7 @@ index ee02b30..270e88e 100644 + + 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; @@ -423,7 +423,7 @@ index ee02b30..270e88e 100644 + 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); @@ -240,6 +271,10 @@ int kvmppc_h_pr(struct kvm_vcpu *vcpu, unsigned long cmd) diff --git a/a/content_digest b/N1/content_digest index fad87b5..fb5d8d3 100644 --- a/a/content_digest +++ b/N1/content_digest @@ -1,16 +1,15 @@ "ref\01360584763-21988-1-git-send-email-a\0" "From\0aik@ozlabs.ru\0" "Subject\0[PATCH 2/4] powerpc kvm: added multiple TCEs requests support\0" - "Date\0Mon, 11 Feb 2013 12:12:41 +0000\0" + "Date\0Mon, 11 Feb 2013 23:12:41 +1100\0" "To\0Benjamin Herrenschmidt <benh@kernel.crashing.org>\0" - "Cc\0Alexey Kardashevskiy <aik@ozlabs.ru>" - Paul Mackerras <paulus@samba.org> + "Cc\0kvm@vger.kernel.org" + Alexey Kardashevskiy <aik@ozlabs.ru> Alexander Graf <agraf@suse.de> - Michael Ellerman <michael@ellerman.id.au> - linuxppc-dev@lists.ozlabs.org - linux-kernel@vger.kernel.org kvm-ppc@vger.kernel.org - kvm@vger.kernel.org + linux-kernel@vger.kernel.org + Paul Mackerras <paulus@samba.org> + linuxppc-dev@lists.ozlabs.org " David Gibson <david@gibson.dropbear.id.au>\0" "\00:1\0" "b\0" @@ -106,7 +105,7 @@ "+\tstruct kvmppc_spapr_tce_table *stt;\n" "+\n" "+\tlist_for_each_entry(stt, &vcpu->kvm->arch.spapr_tce_tables, list) {\n" - "+\t\tif (stt->liobn = liobn)\n" + "+\t\tif (stt->liobn == liobn)\n" "+\t\t\treturn stt;\n" "+\t}\n" "+\n" @@ -257,7 +256,7 @@ "+\t\treturn H_TOO_HARD;\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" @@ -359,7 +358,7 @@ "+\t\tret = kvmppc_virtmode_h_put_tce(vcpu, kvmppc_get_gpr(vcpu, 4),\n" "+\t\t\t\t\t kvmppc_get_gpr(vcpu, 5),\n" "+\t\t\t\t\t kvmppc_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" @@ -367,7 +366,7 @@ "+\t\t\t\t\t kvmppc_get_gpr(vcpu, 5),\n" "+\t\t\t\t\t kvmppc_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" @@ -375,7 +374,7 @@ "+\t\t\t\t\t kvmppc_get_gpr(vcpu, 5),\n" "+\t\t\t\t\t kvmppc_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" @@ -408,7 +407,7 @@ " \n" "-\trc = kvmppc_h_put_tce(vcpu, liobn, ioba, tce);\n" "+\trc = kvmppc_virtmode_h_put_tce(vcpu, liobn, ioba, tce, 1);\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" @@ -424,7 +423,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" @@ -439,7 +438,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" "@@ -240,6 +271,10 @@ int kvmppc_h_pr(struct kvm_vcpu *vcpu, unsigned long cmd)\n" @@ -482,4 +481,4 @@ "-- \n" 1.7.10.4 -8fa1a7dfab529345ee2af87bf032a6ff551a268acdbcf66535cf4afd9ad516b4 +4d2e4a10b37d78c42b10b77c8d7f463821f9f310a0aae7b020afb3b34df27ddd
diff --git a/a/1.txt b/N2/1.txt index 4282fc5..bcc6257 100644 --- a/a/1.txt +++ b/N2/1.txt @@ -90,7 +90,7 @@ index 30c2f3b..c38edcd 100644 + struct kvmppc_spapr_tce_table *stt; + + list_for_each_entry(stt, &vcpu->kvm->arch.spapr_tce_tables, list) { -+ if (stt->liobn = liobn) ++ if (stt->liobn == liobn) + return stt; + } + @@ -241,7 +241,7 @@ index 30c2f3b..c38edcd 100644 + return H_TOO_HARD; - 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; @@ -343,7 +343,7 @@ index 71d0c90..13c8436 100644 + 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: @@ -351,7 +351,7 @@ index 71d0c90..13c8436 100644 + 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: @@ -359,7 +359,7 @@ index 71d0c90..13c8436 100644 + 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: @@ -392,7 +392,7 @@ index ee02b30..270e88e 100644 - rc = kvmppc_h_put_tce(vcpu, liobn, ioba, tce); + rc = kvmppc_virtmode_h_put_tce(vcpu, liobn, ioba, tce, 1); -+ if (rc = H_TOO_HARD) ++ if (rc == H_TOO_HARD) + return EMULATE_FAIL; + kvmppc_set_gpr(vcpu, 3, rc); + return EMULATE_DONE; @@ -408,7 +408,7 @@ index ee02b30..270e88e 100644 + + 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; @@ -423,7 +423,7 @@ index ee02b30..270e88e 100644 + 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); @@ -240,6 +271,10 @@ int kvmppc_h_pr(struct kvm_vcpu *vcpu, unsigned long cmd) diff --git a/a/content_digest b/N2/content_digest index fad87b5..6cfd73e 100644 --- a/a/content_digest +++ b/N2/content_digest @@ -1,7 +1,7 @@ "ref\01360584763-21988-1-git-send-email-a\0" "From\0aik@ozlabs.ru\0" "Subject\0[PATCH 2/4] powerpc kvm: added multiple TCEs requests support\0" - "Date\0Mon, 11 Feb 2013 12:12:41 +0000\0" + "Date\0Mon, 11 Feb 2013 23:12:41 +1100\0" "To\0Benjamin Herrenschmidt <benh@kernel.crashing.org>\0" "Cc\0Alexey Kardashevskiy <aik@ozlabs.ru>" Paul Mackerras <paulus@samba.org> @@ -106,7 +106,7 @@ "+\tstruct kvmppc_spapr_tce_table *stt;\n" "+\n" "+\tlist_for_each_entry(stt, &vcpu->kvm->arch.spapr_tce_tables, list) {\n" - "+\t\tif (stt->liobn = liobn)\n" + "+\t\tif (stt->liobn == liobn)\n" "+\t\t\treturn stt;\n" "+\t}\n" "+\n" @@ -257,7 +257,7 @@ "+\t\treturn H_TOO_HARD;\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" @@ -359,7 +359,7 @@ "+\t\tret = kvmppc_virtmode_h_put_tce(vcpu, kvmppc_get_gpr(vcpu, 4),\n" "+\t\t\t\t\t kvmppc_get_gpr(vcpu, 5),\n" "+\t\t\t\t\t kvmppc_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" @@ -367,7 +367,7 @@ "+\t\t\t\t\t kvmppc_get_gpr(vcpu, 5),\n" "+\t\t\t\t\t kvmppc_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" @@ -375,7 +375,7 @@ "+\t\t\t\t\t kvmppc_get_gpr(vcpu, 5),\n" "+\t\t\t\t\t kvmppc_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" @@ -408,7 +408,7 @@ " \n" "-\trc = kvmppc_h_put_tce(vcpu, liobn, ioba, tce);\n" "+\trc = kvmppc_virtmode_h_put_tce(vcpu, liobn, ioba, tce, 1);\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" @@ -424,7 +424,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" @@ -439,7 +439,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" "@@ -240,6 +271,10 @@ int kvmppc_h_pr(struct kvm_vcpu *vcpu, unsigned long cmd)\n" @@ -482,4 +482,4 @@ "-- \n" 1.7.10.4 -8fa1a7dfab529345ee2af87bf032a6ff551a268acdbcf66535cf4afd9ad516b4 +d507015cbd8e2d8064c27b1c55e7fe78152ca77af2328bdb53ad831624a67b6f
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.