diff for duplicates of <5399C41F.8010108@suse.de> diff --git a/a/1.txt b/N1/1.txt index bf0c61b..bc637a8 100644 --- a/a/1.txt +++ b/N1/1.txt @@ -53,7 +53,7 @@ Please make prev an enum :) > { > - /* 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); > + ulong pc = kvmppc_get_pc(vcpu); > @@ -127,7 +127,7 @@ file instead? That would unify it with booke and ... > + > + /* 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, prev, &vcpu->arch.last_inst); > + > + *inst = kvmppc_need_byteswap(vcpu) ? swab32(vcpu->arch.last_inst) : @@ -138,7 +138,7 @@ file instead? That would unify it with booke and ... > + > 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_64_mmu_hv.c b/arch/powerpc/kvm/book3s_64_mmu_hv.c > index 8056107..2ffb3dd 100644 > --- a/arch/powerpc/kvm/book3s_64_mmu_hv.c @@ -157,9 +157,9 @@ file instead? That would unify it with booke and ... > + /* > * If we fail, we just return to the guest and try executing it again. > */ -> - if (vcpu->arch.last_inst = KVM_INST_FETCH_FAILED) { +> - if (vcpu->arch.last_inst == KVM_INST_FETCH_FAILED) { > - ret = kvmppc_ld(vcpu, &srr0, sizeof(u32), &last_inst, false); -> - if (ret != EMULATE_DONE || last_inst = KVM_INST_FETCH_FAILED) +> - if (ret != EMULATE_DONE || last_inst == KVM_INST_FETCH_FAILED) > - return RESUME_GUEST; > - vcpu->arch.last_inst = last_inst; > - } @@ -247,7 +247,7 @@ file instead? That would unify it with booke and ... > - int ret; > - > - ret = kvmppc_ld(vcpu, &srr0, sizeof(u32), &last_inst, false); -> - if (ret = -ENOENT) { +> - if (ret == -ENOENT) { > - ulong msr = kvmppc_get_msr(vcpu); > - > - msr = kvmppc_set_field(msr, 33, 33, 1); @@ -269,7 +269,7 @@ file instead? That would unify it with booke and ... > - return EMULATE_DONE; > - > - /* Read out the instruction */ -> - if (kvmppc_read_inst(vcpu) = EMULATE_DONE) +> - if (kvmppc_read_inst(vcpu) == EMULATE_DONE) > - /* Need to emulate */ > - return EMULATE_FAIL; > - @@ -304,7 +304,9 @@ I don't think we want the \n here :). > + "0x%lx (0x%x)\n", kvmppc_get_pc(vcpu), last_inst); > #endif -> - if ((kvmppc_get_last_inst(vcpu) & 0xff0007ff) !> + if ((last_inst & 0xff0007ff) !> (INS_DCBZ & 0xfffffff7)) { +> - if ((kvmppc_get_last_inst(vcpu) & 0xff0007ff) != +> + if ((last_inst & 0xff0007ff) != +> (INS_DCBZ & 0xfffffff7)) { > kvmppc_core_queue_program(vcpu, flags); > r = RESUME_GUEST; > @@ -1004,7 +977,7 @@ program_interrupt: @@ -338,8 +340,8 @@ I don't think we want the \n here :). > + } > + > if (vcpu->arch.papr_enabled && -> - (kvmppc_get_last_sc(vcpu) = 0x44000022) && -> + (last_sc = 0x44000022) && +> - (kvmppc_get_last_sc(vcpu) == 0x44000022) && +> + (last_sc == 0x44000022) && > !(kvmppc_get_msr(vcpu) & MSR_PR)) { > /* SC 1 papr hypercalls */ > ulong cmd = kvmppc_get_gpr(vcpu, 3); @@ -387,7 +389,7 @@ I don't think we want the \n here :). > + } > + > + emul = kvmppc_get_last_inst(vcpu, false, &last_inst); -> + if (emul = EMULATE_DONE) { +> + if (emul == EMULATE_DONE) { > /* we need to emulate this instruction */ > goto program_interrupt; > break; @@ -401,7 +403,7 @@ I don't think we want the \n here :). > break; > } > case BOOK3S_INTERRUPT_ALIGNMENT: -> - if (kvmppc_read_inst(vcpu) = EMULATE_DONE) { +> - if (kvmppc_read_inst(vcpu) == EMULATE_DONE) { Phew - this removes the ability to inject an instruction page fault on this path. It's probably ok to do so, but please eliminate @@ -416,7 +418,7 @@ Alex > + u32 last_inst; > + int emul = kvmppc_get_last_inst(vcpu, false, &last_inst); > + -> + if (emul = EMULATE_DONE) { +> + if (emul == EMULATE_DONE) { > u32 dsisr; > u64 dar; > diff --git a/a/content_digest b/N1/content_digest index 9a0db3f..3a612e4 100644 --- a/a/content_digest +++ b/N1/content_digest @@ -2,11 +2,11 @@ "ref\01401724216-26486-4-git-send-email-mihai.caraman@freescale.com\0" "From\0Alexander Graf <agraf@suse.de>\0" "Subject\0Re: [PATCH 3/4 v3] KVM: PPC: Alow kvmppc_get_last_inst() to fail\0" - "Date\0Thu, 12 Jun 2014 15:15:43 +0000\0" + "Date\0Thu, 12 Jun 2014 17:15:43 +0200\0" "To\0Mihai Caraman <mihai.caraman@freescale.com>\0" - "Cc\0kvm-ppc@vger.kernel.org" + "Cc\0linuxppc-dev@lists.ozlabs.org" kvm@vger.kernel.org - " linuxppc-dev@lists.ozlabs.org\0" + " kvm-ppc@vger.kernel.org\0" "\00:1\0" "b\0" "On 06/02/2014 05:50 PM, Mihai Caraman wrote:\n" @@ -64,7 +64,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" "> +\tulong pc = kvmppc_get_pc(vcpu);\n" "> \n" @@ -138,7 +138,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\tret = kvmppc_load_last_inst(vcpu, prev, &vcpu->arch.last_inst);\n" "> +\n" "> +\t*inst = kvmppc_need_byteswap(vcpu) ? swab32(vcpu->arch.last_inst) :\n" @@ -149,7 +149,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_64_mmu_hv.c b/arch/powerpc/kvm/book3s_64_mmu_hv.c\n" "> index 8056107..2ffb3dd 100644\n" "> --- a/arch/powerpc/kvm/book3s_64_mmu_hv.c\n" @@ -168,9 +168,9 @@ "> +\t/*\n" "> \t * If we fail, we just return to the guest and try executing it again.\n" "> \t */\n" - "> -\tif (vcpu->arch.last_inst = KVM_INST_FETCH_FAILED) {\n" + "> -\tif (vcpu->arch.last_inst == KVM_INST_FETCH_FAILED) {\n" "> -\t\tret = kvmppc_ld(vcpu, &srr0, sizeof(u32), &last_inst, false);\n" - "> -\t\tif (ret != EMULATE_DONE || last_inst = KVM_INST_FETCH_FAILED)\n" + "> -\t\tif (ret != EMULATE_DONE || last_inst == KVM_INST_FETCH_FAILED)\n" "> -\t\t\treturn RESUME_GUEST;\n" "> -\t\tvcpu->arch.last_inst = last_inst;\n" "> -\t}\n" @@ -258,7 +258,7 @@ "> -\tint ret;\n" "> -\n" "> -\tret = kvmppc_ld(vcpu, &srr0, sizeof(u32), &last_inst, false);\n" - "> -\tif (ret = -ENOENT) {\n" + "> -\tif (ret == -ENOENT) {\n" "> -\t\tulong msr = kvmppc_get_msr(vcpu);\n" "> -\n" "> -\t\tmsr = kvmppc_set_field(msr, 33, 33, 1);\n" @@ -280,7 +280,7 @@ "> -\t\treturn EMULATE_DONE;\n" "> -\n" "> -\t/* Read out the instruction */\n" - "> -\tif (kvmppc_read_inst(vcpu) = EMULATE_DONE)\n" + "> -\tif (kvmppc_read_inst(vcpu) == EMULATE_DONE)\n" "> -\t\t/* Need to emulate */\n" "> -\t\treturn EMULATE_FAIL;\n" "> -\n" @@ -315,7 +315,9 @@ "\n" "> +\t\t\t \"0x%lx (0x%x)\\n\", kvmppc_get_pc(vcpu), last_inst);\n" "> #endif\n" - "> -\t\t\tif ((kvmppc_get_last_inst(vcpu) & 0xff0007ff) !> +\t\t\tif ((last_inst & 0xff0007ff) !> \t\t\t (INS_DCBZ & 0xfffffff7)) {\n" + "> -\t\t\tif ((kvmppc_get_last_inst(vcpu) & 0xff0007ff) !=\n" + "> +\t\t\tif ((last_inst & 0xff0007ff) !=\n" + "> \t\t\t (INS_DCBZ & 0xfffffff7)) {\n" "> \t\t\t\tkvmppc_core_queue_program(vcpu, flags);\n" "> \t\t\t\tr = RESUME_GUEST;\n" "> @@ -1004,7 +977,7 @@ program_interrupt:\n" @@ -349,8 +351,8 @@ "> +\t\t}\n" "> +\n" "> \t\tif (vcpu->arch.papr_enabled &&\n" - "> -\t\t (kvmppc_get_last_sc(vcpu) = 0x44000022) &&\n" - "> +\t\t (last_sc = 0x44000022) &&\n" + "> -\t\t (kvmppc_get_last_sc(vcpu) == 0x44000022) &&\n" + "> +\t\t (last_sc == 0x44000022) &&\n" "> \t\t !(kvmppc_get_msr(vcpu) & MSR_PR)) {\n" "> \t\t\t/* SC 1 papr hypercalls */\n" "> \t\t\tulong cmd = kvmppc_get_gpr(vcpu, 3);\n" @@ -398,7 +400,7 @@ "> +\t\t}\n" "> +\n" "> +\t\temul = kvmppc_get_last_inst(vcpu, false, &last_inst);\n" - "> +\t\tif (emul = EMULATE_DONE) {\n" + "> +\t\tif (emul == EMULATE_DONE) {\n" "> \t\t\t/* we need to emulate this instruction */\n" "> \t\t\tgoto program_interrupt;\n" "> \t\t\tbreak;\n" @@ -412,7 +414,7 @@ "> \t\tbreak;\n" "> \t}\n" "> \tcase BOOK3S_INTERRUPT_ALIGNMENT:\n" - "> -\t\tif (kvmppc_read_inst(vcpu) = EMULATE_DONE) {\n" + "> -\t\tif (kvmppc_read_inst(vcpu) == EMULATE_DONE) {\n" "\n" "Phew - this removes the ability to inject an instruction page fault on \n" "this path. It's probably ok to do so, but please eliminate \n" @@ -427,7 +429,7 @@ "> +\t\tu32 last_inst;\n" "> +\t\tint emul = kvmppc_get_last_inst(vcpu, false, &last_inst);\n" "> +\n" - "> +\t\tif (emul = EMULATE_DONE) {\n" + "> +\t\tif (emul == EMULATE_DONE) {\n" "> \t\t\tu32 dsisr;\n" "> \t\t\tu64 dar;\n" "> \n" @@ -537,4 +539,4 @@ "> \t\tWARN_ON(1);\n" "> \t\tr = RESUME_GUEST;" -6cc02e9ae58a6bc03c4530b53765ccf372bdec60cf6558e09e0d74d514214f5d +971a1af326c3a236102e9a906c890cb64bbbbf2f8301e98119a6c79bfb03e767
diff --git a/a/1.txt b/N2/1.txt index bf0c61b..bc637a8 100644 --- a/a/1.txt +++ b/N2/1.txt @@ -53,7 +53,7 @@ Please make prev an enum :) > { > - /* 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); > + ulong pc = kvmppc_get_pc(vcpu); > @@ -127,7 +127,7 @@ file instead? That would unify it with booke and ... > + > + /* 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, prev, &vcpu->arch.last_inst); > + > + *inst = kvmppc_need_byteswap(vcpu) ? swab32(vcpu->arch.last_inst) : @@ -138,7 +138,7 @@ file instead? That would unify it with booke and ... > + > 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_64_mmu_hv.c b/arch/powerpc/kvm/book3s_64_mmu_hv.c > index 8056107..2ffb3dd 100644 > --- a/arch/powerpc/kvm/book3s_64_mmu_hv.c @@ -157,9 +157,9 @@ file instead? That would unify it with booke and ... > + /* > * If we fail, we just return to the guest and try executing it again. > */ -> - if (vcpu->arch.last_inst = KVM_INST_FETCH_FAILED) { +> - if (vcpu->arch.last_inst == KVM_INST_FETCH_FAILED) { > - ret = kvmppc_ld(vcpu, &srr0, sizeof(u32), &last_inst, false); -> - if (ret != EMULATE_DONE || last_inst = KVM_INST_FETCH_FAILED) +> - if (ret != EMULATE_DONE || last_inst == KVM_INST_FETCH_FAILED) > - return RESUME_GUEST; > - vcpu->arch.last_inst = last_inst; > - } @@ -247,7 +247,7 @@ file instead? That would unify it with booke and ... > - int ret; > - > - ret = kvmppc_ld(vcpu, &srr0, sizeof(u32), &last_inst, false); -> - if (ret = -ENOENT) { +> - if (ret == -ENOENT) { > - ulong msr = kvmppc_get_msr(vcpu); > - > - msr = kvmppc_set_field(msr, 33, 33, 1); @@ -269,7 +269,7 @@ file instead? That would unify it with booke and ... > - return EMULATE_DONE; > - > - /* Read out the instruction */ -> - if (kvmppc_read_inst(vcpu) = EMULATE_DONE) +> - if (kvmppc_read_inst(vcpu) == EMULATE_DONE) > - /* Need to emulate */ > - return EMULATE_FAIL; > - @@ -304,7 +304,9 @@ I don't think we want the \n here :). > + "0x%lx (0x%x)\n", kvmppc_get_pc(vcpu), last_inst); > #endif -> - if ((kvmppc_get_last_inst(vcpu) & 0xff0007ff) !> + if ((last_inst & 0xff0007ff) !> (INS_DCBZ & 0xfffffff7)) { +> - if ((kvmppc_get_last_inst(vcpu) & 0xff0007ff) != +> + if ((last_inst & 0xff0007ff) != +> (INS_DCBZ & 0xfffffff7)) { > kvmppc_core_queue_program(vcpu, flags); > r = RESUME_GUEST; > @@ -1004,7 +977,7 @@ program_interrupt: @@ -338,8 +340,8 @@ I don't think we want the \n here :). > + } > + > if (vcpu->arch.papr_enabled && -> - (kvmppc_get_last_sc(vcpu) = 0x44000022) && -> + (last_sc = 0x44000022) && +> - (kvmppc_get_last_sc(vcpu) == 0x44000022) && +> + (last_sc == 0x44000022) && > !(kvmppc_get_msr(vcpu) & MSR_PR)) { > /* SC 1 papr hypercalls */ > ulong cmd = kvmppc_get_gpr(vcpu, 3); @@ -387,7 +389,7 @@ I don't think we want the \n here :). > + } > + > + emul = kvmppc_get_last_inst(vcpu, false, &last_inst); -> + if (emul = EMULATE_DONE) { +> + if (emul == EMULATE_DONE) { > /* we need to emulate this instruction */ > goto program_interrupt; > break; @@ -401,7 +403,7 @@ I don't think we want the \n here :). > break; > } > case BOOK3S_INTERRUPT_ALIGNMENT: -> - if (kvmppc_read_inst(vcpu) = EMULATE_DONE) { +> - if (kvmppc_read_inst(vcpu) == EMULATE_DONE) { Phew - this removes the ability to inject an instruction page fault on this path. It's probably ok to do so, but please eliminate @@ -416,7 +418,7 @@ Alex > + u32 last_inst; > + int emul = kvmppc_get_last_inst(vcpu, false, &last_inst); > + -> + if (emul = EMULATE_DONE) { +> + if (emul == EMULATE_DONE) { > u32 dsisr; > u64 dar; > diff --git a/a/content_digest b/N2/content_digest index 9a0db3f..cb4ac4d 100644 --- a/a/content_digest +++ b/N2/content_digest @@ -2,7 +2,7 @@ "ref\01401724216-26486-4-git-send-email-mihai.caraman@freescale.com\0" "From\0Alexander Graf <agraf@suse.de>\0" "Subject\0Re: [PATCH 3/4 v3] KVM: PPC: Alow kvmppc_get_last_inst() to fail\0" - "Date\0Thu, 12 Jun 2014 15:15:43 +0000\0" + "Date\0Thu, 12 Jun 2014 17:15:43 +0200\0" "To\0Mihai Caraman <mihai.caraman@freescale.com>\0" "Cc\0kvm-ppc@vger.kernel.org" kvm@vger.kernel.org @@ -64,7 +64,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" "> +\tulong pc = kvmppc_get_pc(vcpu);\n" "> \n" @@ -138,7 +138,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\tret = kvmppc_load_last_inst(vcpu, prev, &vcpu->arch.last_inst);\n" "> +\n" "> +\t*inst = kvmppc_need_byteswap(vcpu) ? swab32(vcpu->arch.last_inst) :\n" @@ -149,7 +149,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_64_mmu_hv.c b/arch/powerpc/kvm/book3s_64_mmu_hv.c\n" "> index 8056107..2ffb3dd 100644\n" "> --- a/arch/powerpc/kvm/book3s_64_mmu_hv.c\n" @@ -168,9 +168,9 @@ "> +\t/*\n" "> \t * If we fail, we just return to the guest and try executing it again.\n" "> \t */\n" - "> -\tif (vcpu->arch.last_inst = KVM_INST_FETCH_FAILED) {\n" + "> -\tif (vcpu->arch.last_inst == KVM_INST_FETCH_FAILED) {\n" "> -\t\tret = kvmppc_ld(vcpu, &srr0, sizeof(u32), &last_inst, false);\n" - "> -\t\tif (ret != EMULATE_DONE || last_inst = KVM_INST_FETCH_FAILED)\n" + "> -\t\tif (ret != EMULATE_DONE || last_inst == KVM_INST_FETCH_FAILED)\n" "> -\t\t\treturn RESUME_GUEST;\n" "> -\t\tvcpu->arch.last_inst = last_inst;\n" "> -\t}\n" @@ -258,7 +258,7 @@ "> -\tint ret;\n" "> -\n" "> -\tret = kvmppc_ld(vcpu, &srr0, sizeof(u32), &last_inst, false);\n" - "> -\tif (ret = -ENOENT) {\n" + "> -\tif (ret == -ENOENT) {\n" "> -\t\tulong msr = kvmppc_get_msr(vcpu);\n" "> -\n" "> -\t\tmsr = kvmppc_set_field(msr, 33, 33, 1);\n" @@ -280,7 +280,7 @@ "> -\t\treturn EMULATE_DONE;\n" "> -\n" "> -\t/* Read out the instruction */\n" - "> -\tif (kvmppc_read_inst(vcpu) = EMULATE_DONE)\n" + "> -\tif (kvmppc_read_inst(vcpu) == EMULATE_DONE)\n" "> -\t\t/* Need to emulate */\n" "> -\t\treturn EMULATE_FAIL;\n" "> -\n" @@ -315,7 +315,9 @@ "\n" "> +\t\t\t \"0x%lx (0x%x)\\n\", kvmppc_get_pc(vcpu), last_inst);\n" "> #endif\n" - "> -\t\t\tif ((kvmppc_get_last_inst(vcpu) & 0xff0007ff) !> +\t\t\tif ((last_inst & 0xff0007ff) !> \t\t\t (INS_DCBZ & 0xfffffff7)) {\n" + "> -\t\t\tif ((kvmppc_get_last_inst(vcpu) & 0xff0007ff) !=\n" + "> +\t\t\tif ((last_inst & 0xff0007ff) !=\n" + "> \t\t\t (INS_DCBZ & 0xfffffff7)) {\n" "> \t\t\t\tkvmppc_core_queue_program(vcpu, flags);\n" "> \t\t\t\tr = RESUME_GUEST;\n" "> @@ -1004,7 +977,7 @@ program_interrupt:\n" @@ -349,8 +351,8 @@ "> +\t\t}\n" "> +\n" "> \t\tif (vcpu->arch.papr_enabled &&\n" - "> -\t\t (kvmppc_get_last_sc(vcpu) = 0x44000022) &&\n" - "> +\t\t (last_sc = 0x44000022) &&\n" + "> -\t\t (kvmppc_get_last_sc(vcpu) == 0x44000022) &&\n" + "> +\t\t (last_sc == 0x44000022) &&\n" "> \t\t !(kvmppc_get_msr(vcpu) & MSR_PR)) {\n" "> \t\t\t/* SC 1 papr hypercalls */\n" "> \t\t\tulong cmd = kvmppc_get_gpr(vcpu, 3);\n" @@ -398,7 +400,7 @@ "> +\t\t}\n" "> +\n" "> +\t\temul = kvmppc_get_last_inst(vcpu, false, &last_inst);\n" - "> +\t\tif (emul = EMULATE_DONE) {\n" + "> +\t\tif (emul == EMULATE_DONE) {\n" "> \t\t\t/* we need to emulate this instruction */\n" "> \t\t\tgoto program_interrupt;\n" "> \t\t\tbreak;\n" @@ -412,7 +414,7 @@ "> \t\tbreak;\n" "> \t}\n" "> \tcase BOOK3S_INTERRUPT_ALIGNMENT:\n" - "> -\t\tif (kvmppc_read_inst(vcpu) = EMULATE_DONE) {\n" + "> -\t\tif (kvmppc_read_inst(vcpu) == EMULATE_DONE) {\n" "\n" "Phew - this removes the ability to inject an instruction page fault on \n" "this path. It's probably ok to do so, but please eliminate \n" @@ -427,7 +429,7 @@ "> +\t\tu32 last_inst;\n" "> +\t\tint emul = kvmppc_get_last_inst(vcpu, false, &last_inst);\n" "> +\n" - "> +\t\tif (emul = EMULATE_DONE) {\n" + "> +\t\tif (emul == EMULATE_DONE) {\n" "> \t\t\tu32 dsisr;\n" "> \t\t\tu64 dar;\n" "> \n" @@ -537,4 +539,4 @@ "> \t\tWARN_ON(1);\n" "> \t\tr = RESUME_GUEST;" -6cc02e9ae58a6bc03c4530b53765ccf372bdec60cf6558e09e0d74d514214f5d +a137f1385a95f25e0d2a39feffd05a15d4a6dbf196a78f6bbc7776020e946f04
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.