diff for duplicates of <536B8716.5010807@suse.de> diff --git a/a/1.txt b/N1/1.txt index 21e62ae..03147f9 100644 --- a/a/1.txt +++ b/N1/1.txt @@ -44,8 +44,8 @@ On 05/06/2014 09:06 PM, mihai.caraman@freescale.com wrote: >>> + u32 last_inst; >>> >>> - ret = kvmppc_ld(vcpu, &srr0, sizeof(u32), &last_inst, false); ->>> - if (ret = -ENOENT) { ->>> + if (kvmppc_get_last_inst(vcpu, &last_inst) = -ENOENT) { +>>> - if (ret == -ENOENT) { +>>> + if (kvmppc_get_last_inst(vcpu, &last_inst) == -ENOENT) { >> ENOENT? > You have to tell us :) Why does kvmppc_ld() mix emulation_result > enumeration with generic errors? Do you want to change that and @@ -81,7 +81,9 @@ everywhere now. >>> + 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; >>> @@ -894,7 +894,7 @@ program_interrupt: @@ -113,8 +115,8 @@ go back into the guest. > >>> if (vcpu->arch.papr_enabled && ->>> - (kvmppc_get_last_sc(vcpu) = 0x44000022) && ->>> + (last_sc = 0x44000022) && +>>> - (kvmppc_get_last_sc(vcpu) == 0x44000022) && +>>> + (last_sc == 0x44000022) && >>> !(vcpu->arch.shared->msr & MSR_PR)) { >>> /* SC 1 papr hypercalls */ >>> ulong cmd = kvmppc_get_gpr(vcpu, 3); @@ -133,7 +135,7 @@ go back into the guest. >>> + { >>> + u32 last_inst; >>> + ->>> if (kvmppc_read_inst(vcpu) = EMULATE_DONE) { +>>> if (kvmppc_read_inst(vcpu) == EMULATE_DONE) { >>> - vcpu->arch.shared->dsisr = kvmppc_alignment_dsisr(vcpu, >>> - kvmppc_get_last_inst(vcpu)); >>> - vcpu->arch.shared->dar = kvmppc_alignment_dar(vcpu, diff --git a/a/content_digest b/N1/content_digest index 75ef06e..25e71bd 100644 --- a/a/content_digest +++ b/N1/content_digest @@ -4,11 +4,11 @@ "ref\0f5c0d1ca058346edb91f347eeb399cac@BY2PR03MB508.namprd03.prod.outlook.com\0" "From\0Alexander Graf <agraf@suse.de>\0" "Subject\0Re: [PATCH v2 3/4] KVM: PPC: Alow kvmppc_get_last_inst() to fail\0" - "Date\0Thu, 08 May 2014 13:31:02 +0000\0" + "Date\0Thu, 08 May 2014 15:31:02 +0200\0" "To\0mihai.caraman@freescale.com <mihai.caraman@freescale.com>\0" - "Cc\0kvm-ppc@vger.kernel.org <kvm-ppc@vger.kernel.org>" + "Cc\0linuxppc-dev@lists.ozlabs.org <linuxppc-dev@lists.ozlabs.org>" kvm@vger.kernel.org <kvm@vger.kernel.org> - " linuxppc-dev@lists.ozlabs.org <linuxppc-dev@lists.ozlabs.org>\0" + " kvm-ppc@vger.kernel.org <kvm-ppc@vger.kernel.org>\0" "\00:1\0" "b\0" "On 05/06/2014 09:06 PM, mihai.caraman@freescale.com wrote:\n" @@ -57,8 +57,8 @@ ">>> +\tu32 last_inst;\n" ">>>\n" ">>> -\tret = kvmppc_ld(vcpu, &srr0, sizeof(u32), &last_inst, false);\n" - ">>> -\tif (ret = -ENOENT) {\n" - ">>> +\tif (kvmppc_get_last_inst(vcpu, &last_inst) = -ENOENT) {\n" + ">>> -\tif (ret == -ENOENT) {\n" + ">>> +\tif (kvmppc_get_last_inst(vcpu, &last_inst) == -ENOENT) {\n" ">> ENOENT?\n" "> You have to tell us :) Why does kvmppc_ld() mix emulation_result\n" "> enumeration with generic errors? Do you want to change that and\n" @@ -94,7 +94,9 @@ ">>> +\t\t\tpr_info(\"Userspace triggered 0x700 exception at\\n\"\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" ">>> @@ -894,7 +894,7 @@ program_interrupt:\n" @@ -126,8 +128,8 @@ "\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 !(vcpu->arch.shared->msr & MSR_PR)) {\n" ">>> \t\t\t/* SC 1 papr hypercalls */\n" ">>> \t\t\tulong cmd = kvmppc_get_gpr(vcpu, 3);\n" @@ -146,7 +148,7 @@ ">>> +\t{\n" ">>> +\t\tu32 last_inst;\n" ">>> +\n" - ">>> \t\tif (kvmppc_read_inst(vcpu) = EMULATE_DONE) {\n" + ">>> \t\tif (kvmppc_read_inst(vcpu) == EMULATE_DONE) {\n" ">>> -\t\t\tvcpu->arch.shared->dsisr = kvmppc_alignment_dsisr(vcpu,\n" ">>> -\t\t\t\tkvmppc_get_last_inst(vcpu));\n" ">>> -\t\t\tvcpu->arch.shared->dar = kvmppc_alignment_dar(vcpu,\n" @@ -167,4 +169,4 @@ "\n" Alex -380304133664918a87eb323949cb2f32435f6fc132c30246cf117043ab6c5e74 +7cd83f0f824eb26f052ade31f52a7b0888645c1b1a6e87a1bc90c58268e3e08e
diff --git a/a/1.txt b/N2/1.txt index 21e62ae..03147f9 100644 --- a/a/1.txt +++ b/N2/1.txt @@ -44,8 +44,8 @@ On 05/06/2014 09:06 PM, mihai.caraman@freescale.com wrote: >>> + u32 last_inst; >>> >>> - ret = kvmppc_ld(vcpu, &srr0, sizeof(u32), &last_inst, false); ->>> - if (ret = -ENOENT) { ->>> + if (kvmppc_get_last_inst(vcpu, &last_inst) = -ENOENT) { +>>> - if (ret == -ENOENT) { +>>> + if (kvmppc_get_last_inst(vcpu, &last_inst) == -ENOENT) { >> ENOENT? > You have to tell us :) Why does kvmppc_ld() mix emulation_result > enumeration with generic errors? Do you want to change that and @@ -81,7 +81,9 @@ everywhere now. >>> + 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; >>> @@ -894,7 +894,7 @@ program_interrupt: @@ -113,8 +115,8 @@ go back into the guest. > >>> if (vcpu->arch.papr_enabled && ->>> - (kvmppc_get_last_sc(vcpu) = 0x44000022) && ->>> + (last_sc = 0x44000022) && +>>> - (kvmppc_get_last_sc(vcpu) == 0x44000022) && +>>> + (last_sc == 0x44000022) && >>> !(vcpu->arch.shared->msr & MSR_PR)) { >>> /* SC 1 papr hypercalls */ >>> ulong cmd = kvmppc_get_gpr(vcpu, 3); @@ -133,7 +135,7 @@ go back into the guest. >>> + { >>> + u32 last_inst; >>> + ->>> if (kvmppc_read_inst(vcpu) = EMULATE_DONE) { +>>> if (kvmppc_read_inst(vcpu) == EMULATE_DONE) { >>> - vcpu->arch.shared->dsisr = kvmppc_alignment_dsisr(vcpu, >>> - kvmppc_get_last_inst(vcpu)); >>> - vcpu->arch.shared->dar = kvmppc_alignment_dar(vcpu, diff --git a/a/content_digest b/N2/content_digest index 75ef06e..921925b 100644 --- a/a/content_digest +++ b/N2/content_digest @@ -4,7 +4,7 @@ "ref\0f5c0d1ca058346edb91f347eeb399cac@BY2PR03MB508.namprd03.prod.outlook.com\0" "From\0Alexander Graf <agraf@suse.de>\0" "Subject\0Re: [PATCH v2 3/4] KVM: PPC: Alow kvmppc_get_last_inst() to fail\0" - "Date\0Thu, 08 May 2014 13:31:02 +0000\0" + "Date\0Thu, 08 May 2014 15:31:02 +0200\0" "To\0mihai.caraman@freescale.com <mihai.caraman@freescale.com>\0" "Cc\0kvm-ppc@vger.kernel.org <kvm-ppc@vger.kernel.org>" kvm@vger.kernel.org <kvm@vger.kernel.org> @@ -57,8 +57,8 @@ ">>> +\tu32 last_inst;\n" ">>>\n" ">>> -\tret = kvmppc_ld(vcpu, &srr0, sizeof(u32), &last_inst, false);\n" - ">>> -\tif (ret = -ENOENT) {\n" - ">>> +\tif (kvmppc_get_last_inst(vcpu, &last_inst) = -ENOENT) {\n" + ">>> -\tif (ret == -ENOENT) {\n" + ">>> +\tif (kvmppc_get_last_inst(vcpu, &last_inst) == -ENOENT) {\n" ">> ENOENT?\n" "> You have to tell us :) Why does kvmppc_ld() mix emulation_result\n" "> enumeration with generic errors? Do you want to change that and\n" @@ -94,7 +94,9 @@ ">>> +\t\t\tpr_info(\"Userspace triggered 0x700 exception at\\n\"\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" ">>> @@ -894,7 +894,7 @@ program_interrupt:\n" @@ -126,8 +128,8 @@ "\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 !(vcpu->arch.shared->msr & MSR_PR)) {\n" ">>> \t\t\t/* SC 1 papr hypercalls */\n" ">>> \t\t\tulong cmd = kvmppc_get_gpr(vcpu, 3);\n" @@ -146,7 +148,7 @@ ">>> +\t{\n" ">>> +\t\tu32 last_inst;\n" ">>> +\n" - ">>> \t\tif (kvmppc_read_inst(vcpu) = EMULATE_DONE) {\n" + ">>> \t\tif (kvmppc_read_inst(vcpu) == EMULATE_DONE) {\n" ">>> -\t\t\tvcpu->arch.shared->dsisr = kvmppc_alignment_dsisr(vcpu,\n" ">>> -\t\t\t\tkvmppc_get_last_inst(vcpu));\n" ">>> -\t\t\tvcpu->arch.shared->dar = kvmppc_alignment_dar(vcpu,\n" @@ -167,4 +169,4 @@ "\n" Alex -380304133664918a87eb323949cb2f32435f6fc132c30246cf117043ab6c5e74 +b04a84424561cb0c60da36364c97084168c5cd63cdf0b8aa5273d1c8f22e00f9
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.