diff for duplicates of <53C7D614.6010907@suse.de> diff --git a/a/1.txt b/N1/1.txt index b7deb79..ef3fa6c 100644 --- a/a/1.txt +++ b/N1/1.txt @@ -37,7 +37,7 @@ On 17.07.14 13:22, Mihai Caraman wrote: > - 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); @@ -59,7 +59,7 @@ On 17.07.14 13:22, Mihai Caraman wrote: > - 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; > - @@ -87,7 +87,7 @@ If the flag is set we do paired single instruction emulation. > + last_inst = kvmppc_get_last_inst(vcpu); > + emul = kvmppc_ld(vcpu, &pc, sizeof(u32), &last_inst, > + false); -> + if (emul = EMULATE_DONE) +> + if (emul == EMULATE_DONE) > + goto program_interrupt; > + else > + r = RESUME_GUEST; @@ -135,14 +135,14 @@ Alex > break; > } > case BOOK3S_INTERRUPT_ALIGNMENT: -> - if (kvmppc_read_inst(vcpu) = EMULATE_DONE) { +> - if (kvmppc_read_inst(vcpu) == EMULATE_DONE) { > - u32 last_inst = kvmppc_get_last_inst(vcpu); > + { > + ulong pc = kvmppc_get_pc(vcpu); > + u32 last_inst = kvmppc_get_last_inst(vcpu); > + int emul = kvmppc_ld(vcpu, &pc, sizeof(u32), &last_inst, false); > + -> + if (emul = EMULATE_DONE) { +> + if (emul == EMULATE_DONE) { > u32 dsisr; > u64 dar; > diff --git a/a/content_digest b/N1/content_digest index 1006125..6d27d8f 100644 --- a/a/content_digest +++ b/N1/content_digest @@ -2,11 +2,11 @@ "ref\01405596148-1507-4-git-send-email-mihai.caraman@freescale.com\0" "From\0Alexander Graf <agraf@suse.de>\0" "Subject\0Re: [PATCH v5 3/5] KVM: PPC: Book3s: Remove kvmppc_read_inst() function\0" - "Date\0Thu, 17 Jul 2014 13:56:36 +0000\0" + "Date\0Thu, 17 Jul 2014 15:56:36 +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" @@ -48,7 +48,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" @@ -70,7 +70,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" @@ -98,7 +98,7 @@ "> +\t\t\tlast_inst = kvmppc_get_last_inst(vcpu);\n" "> +\t\t\temul = kvmppc_ld(vcpu, &pc, sizeof(u32), &last_inst,\n" "> +\t\t\t\t\t false);\n" - "> +\t\t\tif (emul = EMULATE_DONE)\n" + "> +\t\t\tif (emul == EMULATE_DONE)\n" "> +\t\t\t\tgoto program_interrupt;\n" "> +\t\t\telse\n" "> +\t\t\t\tr = RESUME_GUEST;\n" @@ -146,14 +146,14 @@ "> \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" "> -\t\t\tu32 last_inst = kvmppc_get_last_inst(vcpu);\n" "> +\t{\n" "> +\t\tulong pc = kvmppc_get_pc(vcpu);\n" "> +\t\tu32 last_inst = kvmppc_get_last_inst(vcpu);\n" "> +\t\tint emul = kvmppc_ld(vcpu, &pc, sizeof(u32), &last_inst, false);\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" @@ -166,4 +166,4 @@ "> \tcase BOOK3S_INTERRUPT_FAC_UNAVAIL:\n" "> \t\tkvmppc_handle_fac(vcpu, vcpu->arch.shadow_fscr >> 56);" -69253ace1751faf0de2f12b54d7a5fa1393e4f538ed333537410da948b109d6d +0c89f5cfe583b05e83d3d4ca793c0255746db90c5132e01de58ce77ef0c0f591
diff --git a/a/1.txt b/N2/1.txt index b7deb79..ef3fa6c 100644 --- a/a/1.txt +++ b/N2/1.txt @@ -37,7 +37,7 @@ On 17.07.14 13:22, Mihai Caraman wrote: > - 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); @@ -59,7 +59,7 @@ On 17.07.14 13:22, Mihai Caraman wrote: > - 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; > - @@ -87,7 +87,7 @@ If the flag is set we do paired single instruction emulation. > + last_inst = kvmppc_get_last_inst(vcpu); > + emul = kvmppc_ld(vcpu, &pc, sizeof(u32), &last_inst, > + false); -> + if (emul = EMULATE_DONE) +> + if (emul == EMULATE_DONE) > + goto program_interrupt; > + else > + r = RESUME_GUEST; @@ -135,14 +135,14 @@ Alex > break; > } > case BOOK3S_INTERRUPT_ALIGNMENT: -> - if (kvmppc_read_inst(vcpu) = EMULATE_DONE) { +> - if (kvmppc_read_inst(vcpu) == EMULATE_DONE) { > - u32 last_inst = kvmppc_get_last_inst(vcpu); > + { > + ulong pc = kvmppc_get_pc(vcpu); > + u32 last_inst = kvmppc_get_last_inst(vcpu); > + int emul = kvmppc_ld(vcpu, &pc, sizeof(u32), &last_inst, false); > + -> + if (emul = EMULATE_DONE) { +> + if (emul == EMULATE_DONE) { > u32 dsisr; > u64 dar; > diff --git a/a/content_digest b/N2/content_digest index 1006125..8d59a06 100644 --- a/a/content_digest +++ b/N2/content_digest @@ -2,7 +2,7 @@ "ref\01405596148-1507-4-git-send-email-mihai.caraman@freescale.com\0" "From\0Alexander Graf <agraf@suse.de>\0" "Subject\0Re: [PATCH v5 3/5] KVM: PPC: Book3s: Remove kvmppc_read_inst() function\0" - "Date\0Thu, 17 Jul 2014 13:56:36 +0000\0" + "Date\0Thu, 17 Jul 2014 15:56:36 +0200\0" "To\0Mihai Caraman <mihai.caraman@freescale.com>" " kvm-ppc@vger.kernel.org\0" "Cc\0kvm@vger.kernel.org" @@ -48,7 +48,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" @@ -70,7 +70,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" @@ -98,7 +98,7 @@ "> +\t\t\tlast_inst = kvmppc_get_last_inst(vcpu);\n" "> +\t\t\temul = kvmppc_ld(vcpu, &pc, sizeof(u32), &last_inst,\n" "> +\t\t\t\t\t false);\n" - "> +\t\t\tif (emul = EMULATE_DONE)\n" + "> +\t\t\tif (emul == EMULATE_DONE)\n" "> +\t\t\t\tgoto program_interrupt;\n" "> +\t\t\telse\n" "> +\t\t\t\tr = RESUME_GUEST;\n" @@ -146,14 +146,14 @@ "> \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" "> -\t\t\tu32 last_inst = kvmppc_get_last_inst(vcpu);\n" "> +\t{\n" "> +\t\tulong pc = kvmppc_get_pc(vcpu);\n" "> +\t\tu32 last_inst = kvmppc_get_last_inst(vcpu);\n" "> +\t\tint emul = kvmppc_ld(vcpu, &pc, sizeof(u32), &last_inst, false);\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" @@ -166,4 +166,4 @@ "> \tcase BOOK3S_INTERRUPT_FAC_UNAVAIL:\n" "> \t\tkvmppc_handle_fac(vcpu, vcpu->arch.shadow_fscr >> 56);" -69253ace1751faf0de2f12b54d7a5fa1393e4f538ed333537410da948b109d6d +4686d82d7a19c49653fda82a5f755313ba247ed0785e22cc2c4a16e52e4d797f
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.