diff for duplicates of <53B55E4A.3050408@suse.de> diff --git a/a/1.txt b/N1/1.txt index efbe5c9..7364f85 100644 --- a/a/1.txt +++ b/N1/1.txt @@ -54,7 +54,7 @@ On 28.06.14 00:49, 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) : @@ -132,7 +132,7 @@ On 28.06.14 00:49, 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 = kvmppc_need_byteswap(vcpu) ? swab32(vcpu->arch.last_inst) : @@ -150,7 +150,7 @@ So here we just return the return value of kvmppc_load_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 bd75902..c17f101 100644 > --- a/arch/powerpc/kvm/book3s.c @@ -164,7 +164,7 @@ So here we just return the return value of kvmppc_load_last_inst() ... > +{ > + ulong pc = kvmppc_get_pc(vcpu); > + -> + if (type = INST_SC) +> + if (type == INST_SC) > + pc -= 4; > + return kvmppc_ld(vcpu, &pc, sizeof(u32), &vcpu->arch.last_inst, false); @@ -176,7 +176,7 @@ space that makes sense for this function. How about something like r = kvmppc_ld(); - if (r = EMULATE_DONE) + if (r == EMULATE_DONE) return r; else return EMULATE_AGAIN; @@ -208,13 +208,14 @@ That way we make sure that we tell the caller only "yes, all is good" or > + /* > * 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; > - } -> + if (kvmppc_get_last_inst(vcpu, INST_GENERIC, &last_inst) !> + EMULATE_DONE) +> + if (kvmppc_get_last_inst(vcpu, INST_GENERIC, &last_inst) != +> + EMULATE_DONE) > + return RESUME_GUEST; This looks great. @@ -320,7 +321,9 @@ Yes, this looks good. > + pr_info("Userspace triggered 0x700 exception at\n 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; > @@ -997,7 +1006,7 @@ program_interrupt: @@ -357,8 +360,8 @@ This also looks good :). > + } > + > 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); @@ -385,7 +388,7 @@ This also looks good :). > - last_inst = kvmppc_get_last_inst(vcpu); > - emul = kvmppc_ld(vcpu, &pc, sizeof(u32), &last_inst, false); > + emul = kvmppc_get_last_inst(vcpu, INST_GENERIC, &last_inst); -> if (emul = EMULATE_DONE) { +> if (emul == EMULATE_DONE) { > /* we need to emulate this instruction */ > goto program_interrupt; > @@ -1105,9 +1129,8 @@ program_interrupt: @@ -398,7 +401,7 @@ This also looks good :). > + u32 last_inst; > + int emul = kvmppc_get_last_inst(vcpu, INST_GENERIC, &last_inst); > -> if (emul = EMULATE_DONE) { +> if (emul == EMULATE_DONE) { > u32 dsisr; > diff --git a/arch/powerpc/kvm/booke.c b/arch/powerpc/kvm/booke.c > index ab62109..34a42b9 100644 diff --git a/a/content_digest b/N1/content_digest index 02d62e0..460e0b7 100644 --- a/a/content_digest +++ b/N1/content_digest @@ -2,11 +2,11 @@ "ref\01403909347-31622-5-git-send-email-mihai.caraman@freescale.com\0" "From\0Alexander Graf <agraf@suse.de>\0" "Subject\0Re: [PATCH 4/5 v4] KVM: PPC: Alow kvmppc_get_last_inst() to fail\0" - "Date\0Thu, 03 Jul 2014 13:44:42 +0000\0" + "Date\0Thu, 03 Jul 2014 15:44:42 +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" @@ -65,7 +65,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" @@ -143,7 +143,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, type, &vcpu->arch.last_inst);\n" "> +\n" "> +\t*inst = kvmppc_need_byteswap(vcpu) ? swab32(vcpu->arch.last_inst) :\n" @@ -161,7 +161,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 bd75902..c17f101 100644\n" "> --- a/arch/powerpc/kvm/book3s.c\n" @@ -175,7 +175,7 @@ "> +{\n" "> +\tulong pc = kvmppc_get_pc(vcpu);\n" "> +\n" - "> +\tif (type = INST_SC)\n" + "> +\tif (type == INST_SC)\n" "> +\t\tpc -= 4;\n" "> +\treturn kvmppc_ld(vcpu, &pc, sizeof(u32), &vcpu->arch.last_inst, false);\n" "\n" @@ -187,7 +187,7 @@ "How about something like\n" "\n" " r = kvmppc_ld();\n" - " if (r = EMULATE_DONE)\n" + " if (r == EMULATE_DONE)\n" " return r;\n" " else\n" " return EMULATE_AGAIN;\n" @@ -219,13 +219,14 @@ "> +\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" - "> +\tif (kvmppc_get_last_inst(vcpu, INST_GENERIC, &last_inst) !> +\t\tEMULATE_DONE)\n" + "> +\tif (kvmppc_get_last_inst(vcpu, INST_GENERIC, &last_inst) !=\n" + "> +\t\tEMULATE_DONE)\n" "> +\t\treturn RESUME_GUEST;\n" "\n" "This looks great.\n" @@ -331,7 +332,9 @@ "> +\t\t\tpr_info(\"Userspace triggered 0x700 exception at\\n 0x%lx (0x%x)\\n\",\n" "> +\t\t\t\tkvmppc_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" "> @@ -997,7 +1006,7 @@ program_interrupt:\n" @@ -368,8 +371,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" @@ -396,7 +399,7 @@ "> -\t\tlast_inst = kvmppc_get_last_inst(vcpu);\n" "> -\t\temul = kvmppc_ld(vcpu, &pc, sizeof(u32), &last_inst, false);\n" "> +\t\temul = kvmppc_get_last_inst(vcpu, INST_GENERIC, &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" "> @@ -1105,9 +1129,8 @@ program_interrupt:\n" @@ -409,7 +412,7 @@ "> +\t\tu32 last_inst;\n" "> +\t\tint emul = kvmppc_get_last_inst(vcpu, INST_GENERIC, &last_inst);\n" "> \n" - "> \t\tif (emul = EMULATE_DONE) {\n" + "> \t\tif (emul == EMULATE_DONE) {\n" "> \t\t\tu32 dsisr;\n" "> diff --git a/arch/powerpc/kvm/booke.c b/arch/powerpc/kvm/booke.c\n" "> index ab62109..34a42b9 100644\n" @@ -525,4 +528,4 @@ "> \t\tWARN_ON(1);\n" "> \t\tr = RESUME_GUEST;" -b9feb5cccec7c7b1fe74a8097f384254953c075c88055e1c28315a429e7a1311 +2b60aa3e4424b11115285ba0d475ed8b7206d4e6bb1221dafe3f527d4583ef3a
diff --git a/a/1.txt b/N2/1.txt index efbe5c9..7364f85 100644 --- a/a/1.txt +++ b/N2/1.txt @@ -54,7 +54,7 @@ On 28.06.14 00:49, 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) : @@ -132,7 +132,7 @@ On 28.06.14 00:49, 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 = kvmppc_need_byteswap(vcpu) ? swab32(vcpu->arch.last_inst) : @@ -150,7 +150,7 @@ So here we just return the return value of kvmppc_load_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 bd75902..c17f101 100644 > --- a/arch/powerpc/kvm/book3s.c @@ -164,7 +164,7 @@ So here we just return the return value of kvmppc_load_last_inst() ... > +{ > + ulong pc = kvmppc_get_pc(vcpu); > + -> + if (type = INST_SC) +> + if (type == INST_SC) > + pc -= 4; > + return kvmppc_ld(vcpu, &pc, sizeof(u32), &vcpu->arch.last_inst, false); @@ -176,7 +176,7 @@ space that makes sense for this function. How about something like r = kvmppc_ld(); - if (r = EMULATE_DONE) + if (r == EMULATE_DONE) return r; else return EMULATE_AGAIN; @@ -208,13 +208,14 @@ That way we make sure that we tell the caller only "yes, all is good" or > + /* > * 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; > - } -> + if (kvmppc_get_last_inst(vcpu, INST_GENERIC, &last_inst) !> + EMULATE_DONE) +> + if (kvmppc_get_last_inst(vcpu, INST_GENERIC, &last_inst) != +> + EMULATE_DONE) > + return RESUME_GUEST; This looks great. @@ -320,7 +321,9 @@ Yes, this looks good. > + pr_info("Userspace triggered 0x700 exception at\n 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; > @@ -997,7 +1006,7 @@ program_interrupt: @@ -357,8 +360,8 @@ This also looks good :). > + } > + > 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); @@ -385,7 +388,7 @@ This also looks good :). > - last_inst = kvmppc_get_last_inst(vcpu); > - emul = kvmppc_ld(vcpu, &pc, sizeof(u32), &last_inst, false); > + emul = kvmppc_get_last_inst(vcpu, INST_GENERIC, &last_inst); -> if (emul = EMULATE_DONE) { +> if (emul == EMULATE_DONE) { > /* we need to emulate this instruction */ > goto program_interrupt; > @@ -1105,9 +1129,8 @@ program_interrupt: @@ -398,7 +401,7 @@ This also looks good :). > + u32 last_inst; > + int emul = kvmppc_get_last_inst(vcpu, INST_GENERIC, &last_inst); > -> if (emul = EMULATE_DONE) { +> if (emul == EMULATE_DONE) { > u32 dsisr; > diff --git a/arch/powerpc/kvm/booke.c b/arch/powerpc/kvm/booke.c > index ab62109..34a42b9 100644 diff --git a/a/content_digest b/N2/content_digest index 02d62e0..c131a14 100644 --- a/a/content_digest +++ b/N2/content_digest @@ -2,7 +2,7 @@ "ref\01403909347-31622-5-git-send-email-mihai.caraman@freescale.com\0" "From\0Alexander Graf <agraf@suse.de>\0" "Subject\0Re: [PATCH 4/5 v4] KVM: PPC: Alow kvmppc_get_last_inst() to fail\0" - "Date\0Thu, 03 Jul 2014 13:44:42 +0000\0" + "Date\0Thu, 03 Jul 2014 15:44:42 +0200\0" "To\0Mihai Caraman <mihai.caraman@freescale.com>" " kvm-ppc@vger.kernel.org\0" "Cc\0kvm@vger.kernel.org" @@ -65,7 +65,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" @@ -143,7 +143,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, type, &vcpu->arch.last_inst);\n" "> +\n" "> +\t*inst = kvmppc_need_byteswap(vcpu) ? swab32(vcpu->arch.last_inst) :\n" @@ -161,7 +161,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 bd75902..c17f101 100644\n" "> --- a/arch/powerpc/kvm/book3s.c\n" @@ -175,7 +175,7 @@ "> +{\n" "> +\tulong pc = kvmppc_get_pc(vcpu);\n" "> +\n" - "> +\tif (type = INST_SC)\n" + "> +\tif (type == INST_SC)\n" "> +\t\tpc -= 4;\n" "> +\treturn kvmppc_ld(vcpu, &pc, sizeof(u32), &vcpu->arch.last_inst, false);\n" "\n" @@ -187,7 +187,7 @@ "How about something like\n" "\n" " r = kvmppc_ld();\n" - " if (r = EMULATE_DONE)\n" + " if (r == EMULATE_DONE)\n" " return r;\n" " else\n" " return EMULATE_AGAIN;\n" @@ -219,13 +219,14 @@ "> +\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" - "> +\tif (kvmppc_get_last_inst(vcpu, INST_GENERIC, &last_inst) !> +\t\tEMULATE_DONE)\n" + "> +\tif (kvmppc_get_last_inst(vcpu, INST_GENERIC, &last_inst) !=\n" + "> +\t\tEMULATE_DONE)\n" "> +\t\treturn RESUME_GUEST;\n" "\n" "This looks great.\n" @@ -331,7 +332,9 @@ "> +\t\t\tpr_info(\"Userspace triggered 0x700 exception at\\n 0x%lx (0x%x)\\n\",\n" "> +\t\t\t\tkvmppc_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" "> @@ -997,7 +1006,7 @@ program_interrupt:\n" @@ -368,8 +371,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" @@ -396,7 +399,7 @@ "> -\t\tlast_inst = kvmppc_get_last_inst(vcpu);\n" "> -\t\temul = kvmppc_ld(vcpu, &pc, sizeof(u32), &last_inst, false);\n" "> +\t\temul = kvmppc_get_last_inst(vcpu, INST_GENERIC, &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" "> @@ -1105,9 +1129,8 @@ program_interrupt:\n" @@ -409,7 +412,7 @@ "> +\t\tu32 last_inst;\n" "> +\t\tint emul = kvmppc_get_last_inst(vcpu, INST_GENERIC, &last_inst);\n" "> \n" - "> \t\tif (emul = EMULATE_DONE) {\n" + "> \t\tif (emul == EMULATE_DONE) {\n" "> \t\t\tu32 dsisr;\n" "> diff --git a/arch/powerpc/kvm/booke.c b/arch/powerpc/kvm/booke.c\n" "> index ab62109..34a42b9 100644\n" @@ -525,4 +528,4 @@ "> \t\tWARN_ON(1);\n" "> \t\tr = RESUME_GUEST;" -b9feb5cccec7c7b1fe74a8097f384254953c075c88055e1c28315a429e7a1311 +c67786aadbbf0963707cd341c043d4455e3b940bbcd424367fc191da77158175
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.