diff for duplicates of <51A330AB.8060805@redhat.com> diff --git a/a/1.txt b/N1/1.txt index c2a4e28..b25a902 100644 --- a/a/1.txt +++ b/N1/1.txt @@ -211,7 +211,7 @@ Paolo > + 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 */ @@ -291,7 +291,7 @@ Paolo > + 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; > + } > + @@ -440,7 +440,7 @@ Paolo > - /* 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; @@ -503,7 +503,7 @@ Paolo > + 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 */ @@ -564,7 +564,7 @@ Paolo > + 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: @@ -572,7 +572,7 @@ Paolo > + 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: @@ -580,7 +580,7 @@ Paolo > + 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: @@ -642,7 +642,7 @@ Paolo > > - 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; @@ -658,7 +658,7 @@ Paolo > + > + 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; @@ -673,7 +673,7 @@ Paolo > + 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 20d0529..2c12ceb 100644 --- a/a/content_digest +++ b/N1/content_digest @@ -2,16 +2,15 @@ "ref\01369105607-20957-2-git-send-email-aik@ozlabs.ru\0" "From\0Paolo Bonzini <pbonzini@redhat.com>\0" "Subject\0Re: [PATCH 1/4] KVM: PPC: Add support for multiple-TCE hcalls\0" - "Date\0Mon, 27 May 2013 10:08:43 +0000\0" + "Date\0Mon, 27 May 2013 12:08:43 +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> + "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> - linux-kernel@vger.kernel.org - kvm@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" "Il 21/05/2013 05:06, Alexey Kardashevskiy ha scritto:\n" @@ -227,7 +226,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" @@ -307,7 +306,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" @@ -456,7 +455,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" @@ -519,7 +518,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" @@ -580,7 +579,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" @@ -588,7 +587,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" @@ -596,7 +595,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" @@ -658,7 +657,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" @@ -674,7 +673,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" @@ -689,7 +688,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" @@ -731,4 +730,4 @@ "> \n" > -5d4e457ccfb9eeaee4d97d9eaa0f2e5973ecf18f6e4f69aca528fa554818ca28 +2e1e8d434f667aaabc49d5b4c48b930da939b03378245f0535d7670c9d1e742f
diff --git a/a/1.txt b/N2/1.txt index c2a4e28..b25a902 100644 --- a/a/1.txt +++ b/N2/1.txt @@ -211,7 +211,7 @@ Paolo > + 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 */ @@ -291,7 +291,7 @@ Paolo > + 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; > + } > + @@ -440,7 +440,7 @@ Paolo > - /* 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; @@ -503,7 +503,7 @@ Paolo > + 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 */ @@ -564,7 +564,7 @@ Paolo > + 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: @@ -572,7 +572,7 @@ Paolo > + 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: @@ -580,7 +580,7 @@ Paolo > + 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: @@ -642,7 +642,7 @@ Paolo > > - 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; @@ -658,7 +658,7 @@ Paolo > + > + 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; @@ -673,7 +673,7 @@ Paolo > + 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 20d0529..e1f9c2f 100644 --- a/a/content_digest +++ b/N2/content_digest @@ -2,7 +2,7 @@ "ref\01369105607-20957-2-git-send-email-aik@ozlabs.ru\0" "From\0Paolo Bonzini <pbonzini@redhat.com>\0" "Subject\0Re: [PATCH 1/4] KVM: PPC: Add support for multiple-TCE hcalls\0" - "Date\0Mon, 27 May 2013 10:08:43 +0000\0" + "Date\0Mon, 27 May 2013 12:08:43 +0200\0" "To\0Alexey Kardashevskiy <aik@ozlabs.ru>\0" "Cc\0linuxppc-dev@lists.ozlabs.org" David Gibson <david@gibson.dropbear.id.au> @@ -227,7 +227,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" @@ -307,7 +307,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" @@ -456,7 +456,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" @@ -519,7 +519,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" @@ -580,7 +580,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" @@ -588,7 +588,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" @@ -596,7 +596,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" @@ -658,7 +658,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" @@ -674,7 +674,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" @@ -689,7 +689,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" @@ -731,4 +731,4 @@ "> \n" > -5d4e457ccfb9eeaee4d97d9eaa0f2e5973ecf18f6e4f69aca528fa554818ca28 +ae829daa6e8759856335ad650b47ea94e769ba538fb81f31d321522a0b244c9b
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.