diff for duplicates of <51DE8EE9.2000508@ozlabs.ru> diff --git a/a/1.txt b/N1/1.txt index 1daa612..95191b4 100644 --- a/a/1.txt +++ b/N1/1.txt @@ -441,10 +441,10 @@ just about vcpu ioctl anymore? Or my brand new ioctl for this? >>>>>> + 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) { @@ -552,7 +552,7 @@ just about vcpu ioctl anymore? Or my brand new ioctl for this? >>>>>> + 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; >>>>>> + } >>>>>> + @@ -807,7 +807,7 @@ On already running kernel? :-/ Wow. How? >>>>>> - /* 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 2782812..2c909d3 100644 --- a/a/content_digest +++ b/N1/content_digest @@ -7,16 +7,15 @@ "ref\043E93931-F213-47CC-ADCF-D3A6D6BC4372@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 10:54:33 +0000\0" + "Date\0Thu, 11 Jul 2013 20:54:33 +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/11/2013 08:11 PM, Alexander Graf wrote:\n" @@ -462,10 +461,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" @@ -573,7 +572,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" @@ -828,7 +827,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" @@ -891,4 +890,4 @@ "-- \n" Alexey -d318ea92824d621216447efeafaf87d2dea4e7acb2da928df3516141c39196c0 +c4d1967b9bba5a31a84e491b4ae344ec7e67e6d372efedc7ed86329ca8fd141b
diff --git a/a/1.txt b/N2/1.txt index 1daa612..95191b4 100644 --- a/a/1.txt +++ b/N2/1.txt @@ -441,10 +441,10 @@ just about vcpu ioctl anymore? Or my brand new ioctl for this? >>>>>> + 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) { @@ -552,7 +552,7 @@ just about vcpu ioctl anymore? Or my brand new ioctl for this? >>>>>> + 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; >>>>>> + } >>>>>> + @@ -807,7 +807,7 @@ On already running kernel? :-/ Wow. How? >>>>>> - /* 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 2782812..1d1e19a 100644 --- a/a/content_digest +++ b/N2/content_digest @@ -7,7 +7,7 @@ "ref\043E93931-F213-47CC-ADCF-D3A6D6BC4372@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 10:54:33 +0000\0" + "Date\0Thu, 11 Jul 2013 20:54:33 +1000\0" "To\0Alexander Graf <agraf@suse.de>\0" "Cc\0linuxppc-dev@lists.ozlabs.org" David Gibson <david@gibson.dropbear.id.au> @@ -462,10 +462,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" @@ -573,7 +573,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" @@ -828,7 +828,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" @@ -891,4 +891,4 @@ "-- \n" Alexey -d318ea92824d621216447efeafaf87d2dea4e7acb2da928df3516141c39196c0 +fc2276651cde3a606e0ec5b363b85fcc47131185054c07aed2b2094547317822
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.