diff for duplicates of <51DE3ECB.7080803@ozlabs.ru> diff --git a/a/1.txt b/N1/1.txt index ef797c9..e94ba2f 100644 --- a/a/1.txt +++ b/N1/1.txt @@ -410,10 +410,10 @@ Removed it. H_TOO_HARD itself says enough already. >>>> + 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) { @@ -521,7 +521,7 @@ Removed it. H_TOO_HARD itself says enough already. >>>> + 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; >>>> + } >>>> + @@ -741,7 +741,7 @@ them at once)? Trace points do not work in real mode as we figured out. >>>> - /* 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; diff --git a/a/content_digest b/N1/content_digest index 8ecbd58..a92770c 100644 --- a/a/content_digest +++ b/N1/content_digest @@ -5,16 +5,15 @@ "ref\0D10E7B99-3A7C-4275-9A49-3CB15598E705@suse.de\0" "From\0Alexey Kardashevskiy <aik@ozlabs.ru>\0" "Subject\0Re: [PATCH 6/8] KVM: PPC: Add support for multiple-TCE hcalls\0" - "Date\0Thu, 11 Jul 2013 05:12:43 +0000\0" + "Date\0Thu, 11 Jul 2013 15:12:43 +1000\0" "To\0Alexander Graf <agraf@suse.de>\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/10/2013 08:05 PM, Alexander Graf wrote:\n" @@ -429,10 +428,10 @@ ">>>> + return H_PARAMETER;\n" ">>>> +\n" ">>>> + tces = kvmppc_vm_gpa_to_hva_and_get(vcpu, tce_list,&pg);\n" - ">>>> + if (tces = ERROR_ADDR)\n" + ">>>> + if (tces == ERROR_ADDR)\n" ">>>> + return H_TOO_HARD;\n" ">>>> +\n" - ">>>> + if (vcpu->arch.tce_rm_fail = TCERM_PUTLIST)\n" + ">>>> + if (vcpu->arch.tce_rm_fail == TCERM_PUTLIST)\n" ">>>> + goto put_list_page_exit;\n" ">>>> +\n" ">>>> + for (i = 0; i< npages; ++i) {\n" @@ -540,7 +539,7 @@ ">>>> + struct kvmppc_spapr_tce_table *tt;\n" ">>>> +\n" ">>>> + list_for_each_entry(tt,&vcpu->kvm->arch.spapr_tce_tables, list) {\n" - ">>>> + if (tt->liobn = liobn)\n" + ">>>> + if (tt->liobn == liobn)\n" ">>>> + return tt;\n" ">>>> + }\n" ">>>> +\n" @@ -760,7 +759,7 @@ ">>>> - /* liobn, ioba, tce); */\n" ">>>> -\n" ">>>> - list_for_each_entry(stt,&kvm->arch.spapr_tce_tables, list) {\n" - ">>>> - if (stt->liobn = liobn) {\n" + ">>>> - if (stt->liobn == liobn) {\n" ">>>> - unsigned long idx = ioba>> SPAPR_TCE_SHIFT;\n" ">>>> - struct page *page;\n" ">>>> - u64 *tbl;\n" @@ -818,4 +817,4 @@ "-- \n" Alexey -6742b44bade0a915c4fe5ede8d790d88534167cf93cb826497dc3c6a792e8ce4 +71e9d2d6b8ec675d2107d057e9e33d924e72176e67a01a341ba6eb08cb60c3d5
diff --git a/a/1.txt b/N2/1.txt index ef797c9..e94ba2f 100644 --- a/a/1.txt +++ b/N2/1.txt @@ -410,10 +410,10 @@ Removed it. H_TOO_HARD itself says enough already. >>>> + 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) { @@ -521,7 +521,7 @@ Removed it. H_TOO_HARD itself says enough already. >>>> + 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; >>>> + } >>>> + @@ -741,7 +741,7 @@ them at once)? Trace points do not work in real mode as we figured out. >>>> - /* 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; diff --git a/a/content_digest b/N2/content_digest index 8ecbd58..f3b6217 100644 --- a/a/content_digest +++ b/N2/content_digest @@ -5,7 +5,7 @@ "ref\0D10E7B99-3A7C-4275-9A49-3CB15598E705@suse.de\0" "From\0Alexey Kardashevskiy <aik@ozlabs.ru>\0" "Subject\0Re: [PATCH 6/8] KVM: PPC: Add support for multiple-TCE hcalls\0" - "Date\0Thu, 11 Jul 2013 05:12:43 +0000\0" + "Date\0Thu, 11 Jul 2013 15:12:43 +1000\0" "To\0Alexander Graf <agraf@suse.de>\0" "Cc\0linuxppc-dev@lists.ozlabs.org" David Gibson <david@gibson.dropbear.id.au> @@ -429,10 +429,10 @@ ">>>> + return H_PARAMETER;\n" ">>>> +\n" ">>>> + tces = kvmppc_vm_gpa_to_hva_and_get(vcpu, tce_list,&pg);\n" - ">>>> + if (tces = ERROR_ADDR)\n" + ">>>> + if (tces == ERROR_ADDR)\n" ">>>> + return H_TOO_HARD;\n" ">>>> +\n" - ">>>> + if (vcpu->arch.tce_rm_fail = TCERM_PUTLIST)\n" + ">>>> + if (vcpu->arch.tce_rm_fail == TCERM_PUTLIST)\n" ">>>> + goto put_list_page_exit;\n" ">>>> +\n" ">>>> + for (i = 0; i< npages; ++i) {\n" @@ -540,7 +540,7 @@ ">>>> + struct kvmppc_spapr_tce_table *tt;\n" ">>>> +\n" ">>>> + list_for_each_entry(tt,&vcpu->kvm->arch.spapr_tce_tables, list) {\n" - ">>>> + if (tt->liobn = liobn)\n" + ">>>> + if (tt->liobn == liobn)\n" ">>>> + return tt;\n" ">>>> + }\n" ">>>> +\n" @@ -760,7 +760,7 @@ ">>>> - /* liobn, ioba, tce); */\n" ">>>> -\n" ">>>> - list_for_each_entry(stt,&kvm->arch.spapr_tce_tables, list) {\n" - ">>>> - if (stt->liobn = liobn) {\n" + ">>>> - if (stt->liobn == liobn) {\n" ">>>> - unsigned long idx = ioba>> SPAPR_TCE_SHIFT;\n" ">>>> - struct page *page;\n" ">>>> - u64 *tbl;\n" @@ -818,4 +818,4 @@ "-- \n" Alexey -6742b44bade0a915c4fe5ede8d790d88534167cf93cb826497dc3c6a792e8ce4 +ef17512ff1826a2154396261cf7aab3bc74ff268ccba06ba4adcc8d5e6af0a16
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.