diff for duplicates of <53C7DBC3.2060104@suse.de> diff --git a/a/1.txt b/N1/1.txt index 2193e2e..5751eb8 100644 --- a/a/1.txt +++ b/N1/1.txt @@ -58,7 +58,7 @@ On 17.07.14 13:22, Mihai Caraman wrote: > -{ > - /* Load the instruction manually if it failed to do so in the > - * exit path */ -> - if (vcpu->arch.last_inst = KVM_INST_FETCH_FAILED) +> - if (vcpu->arch.last_inst == KVM_INST_FETCH_FAILED) > - kvmppc_ld(vcpu, &pc, sizeof(u32), &vcpu->arch.last_inst, false); > - > - return kvmppc_need_byteswap(vcpu) ? swab32(vcpu->arch.last_inst) : @@ -136,11 +136,11 @@ On 17.07.14 13:22, Mihai Caraman wrote: > + > + /* Load the instruction manually if it failed to do so in the > + * exit path */ -> + if (vcpu->arch.last_inst = KVM_INST_FETCH_FAILED) +> + if (vcpu->arch.last_inst == KVM_INST_FETCH_FAILED) > + ret = kvmppc_load_last_inst(vcpu, type, &vcpu->arch.last_inst); > + > + -> + *inst = (ret = EMULATE_DONE && kvmppc_need_byteswap(vcpu)) ? +> + *inst = (ret == EMULATE_DONE && kvmppc_need_byteswap(vcpu)) ? > + swab32(vcpu->arch.last_inst) : vcpu->arch.last_inst; This makes even less sense than the previous version. Either you treat @@ -148,7 +148,7 @@ inst as "definitely overwritten" or as "preserves previous data on failure". So either you unconditionally swap like you did before or you do -if (ret = EMULATE_DONE) +if (ret == EMULATE_DONE) *inst = kvmppc_need_byteswap(vcpu) ? swab32(vcpu->arch.last_inst) : vcpu->arch.last_inst; @@ -158,7 +158,7 @@ vcpu->arch.last_inst; > + > static inline bool is_kvmppc_hv_enabled(struct kvm *kvm) > { -> return kvm->arch.kvm_ops = kvmppc_hv_ops; +> return kvm->arch.kvm_ops == kvmppc_hv_ops; > diff --git a/arch/powerpc/kvm/book3s.c b/arch/powerpc/kvm/book3s.c > index 31facfc..522be6b 100644 > --- a/arch/powerpc/kvm/book3s.c @@ -173,7 +173,7 @@ vcpu->arch.last_inst; > + ulong pc = kvmppc_get_pc(vcpu); > + int r; > + -> + if (type = INST_SC) +> + if (type == INST_SC) > + pc -= 4; > + > + r = kvmppc_ld(vcpu, &pc, sizeof(u32), &vcpu->arch.last_inst, false); diff --git a/a/content_digest b/N1/content_digest index 2da4ba5..c1d9eac 100644 --- a/a/content_digest +++ b/N1/content_digest @@ -2,11 +2,11 @@ "ref\01405596148-1507-5-git-send-email-mihai.caraman@freescale.com\0" "From\0Alexander Graf <agraf@suse.de>\0" "Subject\0Re: [PATCH v5 4/5] KVM: PPC: Alow kvmppc_get_last_inst() to fail\0" - "Date\0Thu, 17 Jul 2014 14:20:51 +0000\0" + "Date\0Thu, 17 Jul 2014 16:20:51 +0200\0" "To\0Mihai Caraman <mihai.caraman@freescale.com>" " kvm-ppc@vger.kernel.org\0" - "Cc\0kvm@vger.kernel.org" - " linuxppc-dev@lists.ozlabs.org\0" + "Cc\0linuxppc-dev@lists.ozlabs.org" + " kvm@vger.kernel.org\0" "\00:1\0" "b\0" "\n" @@ -69,7 +69,7 @@ "> -{\n" "> -\t/* Load the instruction manually if it failed to do so in the\n" "> -\t * exit path */\n" - "> -\tif (vcpu->arch.last_inst = KVM_INST_FETCH_FAILED)\n" + "> -\tif (vcpu->arch.last_inst == KVM_INST_FETCH_FAILED)\n" "> -\t\tkvmppc_ld(vcpu, &pc, sizeof(u32), &vcpu->arch.last_inst, false);\n" "> -\n" "> -\treturn kvmppc_need_byteswap(vcpu) ? swab32(vcpu->arch.last_inst) :\n" @@ -147,11 +147,11 @@ "> +\n" "> +\t/* Load the instruction manually if it failed to do so in the\n" "> +\t * exit path */\n" - "> +\tif (vcpu->arch.last_inst = KVM_INST_FETCH_FAILED)\n" + "> +\tif (vcpu->arch.last_inst == KVM_INST_FETCH_FAILED)\n" "> +\t\tret = kvmppc_load_last_inst(vcpu, type, &vcpu->arch.last_inst);\n" "> +\n" "> +\n" - "> +\t*inst = (ret = EMULATE_DONE && kvmppc_need_byteswap(vcpu)) ?\n" + "> +\t*inst = (ret == EMULATE_DONE && kvmppc_need_byteswap(vcpu)) ?\n" "> +\t\tswab32(vcpu->arch.last_inst) : vcpu->arch.last_inst;\n" "\n" "This makes even less sense than the previous version. Either you treat \n" @@ -159,7 +159,7 @@ "\n" "So either you unconditionally swap like you did before or you do\n" "\n" - "if (ret = EMULATE_DONE)\n" + "if (ret == EMULATE_DONE)\n" " *inst = kvmppc_need_byteswap(vcpu) ? swab32(vcpu->arch.last_inst) : \n" "vcpu->arch.last_inst;\n" "\n" @@ -169,7 +169,7 @@ "> +\n" "> static inline bool is_kvmppc_hv_enabled(struct kvm *kvm)\n" "> {\n" - "> \treturn kvm->arch.kvm_ops = kvmppc_hv_ops;\n" + "> \treturn kvm->arch.kvm_ops == kvmppc_hv_ops;\n" "> diff --git a/arch/powerpc/kvm/book3s.c b/arch/powerpc/kvm/book3s.c\n" "> index 31facfc..522be6b 100644\n" "> --- a/arch/powerpc/kvm/book3s.c\n" @@ -184,7 +184,7 @@ "> +\tulong pc = kvmppc_get_pc(vcpu);\n" "> +\tint r;\n" "> +\n" - "> +\tif (type = INST_SC)\n" + "> +\tif (type == INST_SC)\n" "> +\t\tpc -= 4;\n" "> +\n" "> +\tr = kvmppc_ld(vcpu, &pc, sizeof(u32), &vcpu->arch.last_inst, false);\n" @@ -196,4 +196,4 @@ "\n" Alex -666995e13e5eaf3a027dbf6bd420dd7775571d07175058049d1735b054397839 +d92dd9e17c52ff1ca21cbb7c335af671c3db84f8dc71e7b4be60bd500b7d0cc7
diff --git a/a/1.txt b/N2/1.txt index 2193e2e..5751eb8 100644 --- a/a/1.txt +++ b/N2/1.txt @@ -58,7 +58,7 @@ On 17.07.14 13:22, Mihai Caraman wrote: > -{ > - /* Load the instruction manually if it failed to do so in the > - * exit path */ -> - if (vcpu->arch.last_inst = KVM_INST_FETCH_FAILED) +> - if (vcpu->arch.last_inst == KVM_INST_FETCH_FAILED) > - kvmppc_ld(vcpu, &pc, sizeof(u32), &vcpu->arch.last_inst, false); > - > - return kvmppc_need_byteswap(vcpu) ? swab32(vcpu->arch.last_inst) : @@ -136,11 +136,11 @@ On 17.07.14 13:22, Mihai Caraman wrote: > + > + /* Load the instruction manually if it failed to do so in the > + * exit path */ -> + if (vcpu->arch.last_inst = KVM_INST_FETCH_FAILED) +> + if (vcpu->arch.last_inst == KVM_INST_FETCH_FAILED) > + ret = kvmppc_load_last_inst(vcpu, type, &vcpu->arch.last_inst); > + > + -> + *inst = (ret = EMULATE_DONE && kvmppc_need_byteswap(vcpu)) ? +> + *inst = (ret == EMULATE_DONE && kvmppc_need_byteswap(vcpu)) ? > + swab32(vcpu->arch.last_inst) : vcpu->arch.last_inst; This makes even less sense than the previous version. Either you treat @@ -148,7 +148,7 @@ inst as "definitely overwritten" or as "preserves previous data on failure". So either you unconditionally swap like you did before or you do -if (ret = EMULATE_DONE) +if (ret == EMULATE_DONE) *inst = kvmppc_need_byteswap(vcpu) ? swab32(vcpu->arch.last_inst) : vcpu->arch.last_inst; @@ -158,7 +158,7 @@ vcpu->arch.last_inst; > + > static inline bool is_kvmppc_hv_enabled(struct kvm *kvm) > { -> return kvm->arch.kvm_ops = kvmppc_hv_ops; +> return kvm->arch.kvm_ops == kvmppc_hv_ops; > diff --git a/arch/powerpc/kvm/book3s.c b/arch/powerpc/kvm/book3s.c > index 31facfc..522be6b 100644 > --- a/arch/powerpc/kvm/book3s.c @@ -173,7 +173,7 @@ vcpu->arch.last_inst; > + ulong pc = kvmppc_get_pc(vcpu); > + int r; > + -> + if (type = INST_SC) +> + if (type == INST_SC) > + pc -= 4; > + > + r = kvmppc_ld(vcpu, &pc, sizeof(u32), &vcpu->arch.last_inst, false); diff --git a/a/content_digest b/N2/content_digest index 2da4ba5..da579be 100644 --- a/a/content_digest +++ b/N2/content_digest @@ -2,7 +2,7 @@ "ref\01405596148-1507-5-git-send-email-mihai.caraman@freescale.com\0" "From\0Alexander Graf <agraf@suse.de>\0" "Subject\0Re: [PATCH v5 4/5] KVM: PPC: Alow kvmppc_get_last_inst() to fail\0" - "Date\0Thu, 17 Jul 2014 14:20:51 +0000\0" + "Date\0Thu, 17 Jul 2014 16:20:51 +0200\0" "To\0Mihai Caraman <mihai.caraman@freescale.com>" " kvm-ppc@vger.kernel.org\0" "Cc\0kvm@vger.kernel.org" @@ -69,7 +69,7 @@ "> -{\n" "> -\t/* Load the instruction manually if it failed to do so in the\n" "> -\t * exit path */\n" - "> -\tif (vcpu->arch.last_inst = KVM_INST_FETCH_FAILED)\n" + "> -\tif (vcpu->arch.last_inst == KVM_INST_FETCH_FAILED)\n" "> -\t\tkvmppc_ld(vcpu, &pc, sizeof(u32), &vcpu->arch.last_inst, false);\n" "> -\n" "> -\treturn kvmppc_need_byteswap(vcpu) ? swab32(vcpu->arch.last_inst) :\n" @@ -147,11 +147,11 @@ "> +\n" "> +\t/* Load the instruction manually if it failed to do so in the\n" "> +\t * exit path */\n" - "> +\tif (vcpu->arch.last_inst = KVM_INST_FETCH_FAILED)\n" + "> +\tif (vcpu->arch.last_inst == KVM_INST_FETCH_FAILED)\n" "> +\t\tret = kvmppc_load_last_inst(vcpu, type, &vcpu->arch.last_inst);\n" "> +\n" "> +\n" - "> +\t*inst = (ret = EMULATE_DONE && kvmppc_need_byteswap(vcpu)) ?\n" + "> +\t*inst = (ret == EMULATE_DONE && kvmppc_need_byteswap(vcpu)) ?\n" "> +\t\tswab32(vcpu->arch.last_inst) : vcpu->arch.last_inst;\n" "\n" "This makes even less sense than the previous version. Either you treat \n" @@ -159,7 +159,7 @@ "\n" "So either you unconditionally swap like you did before or you do\n" "\n" - "if (ret = EMULATE_DONE)\n" + "if (ret == EMULATE_DONE)\n" " *inst = kvmppc_need_byteswap(vcpu) ? swab32(vcpu->arch.last_inst) : \n" "vcpu->arch.last_inst;\n" "\n" @@ -169,7 +169,7 @@ "> +\n" "> static inline bool is_kvmppc_hv_enabled(struct kvm *kvm)\n" "> {\n" - "> \treturn kvm->arch.kvm_ops = kvmppc_hv_ops;\n" + "> \treturn kvm->arch.kvm_ops == kvmppc_hv_ops;\n" "> diff --git a/arch/powerpc/kvm/book3s.c b/arch/powerpc/kvm/book3s.c\n" "> index 31facfc..522be6b 100644\n" "> --- a/arch/powerpc/kvm/book3s.c\n" @@ -184,7 +184,7 @@ "> +\tulong pc = kvmppc_get_pc(vcpu);\n" "> +\tint r;\n" "> +\n" - "> +\tif (type = INST_SC)\n" + "> +\tif (type == INST_SC)\n" "> +\t\tpc -= 4;\n" "> +\n" "> +\tr = kvmppc_ld(vcpu, &pc, sizeof(u32), &vcpu->arch.last_inst, false);\n" @@ -196,4 +196,4 @@ "\n" Alex -666995e13e5eaf3a027dbf6bd420dd7775571d07175058049d1735b054397839 +b1bb540b57bcc5fa02ad65a0edefb9e48012c7342f068ab1cb522dc4898e9a43
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.