diff for duplicates of <540DAA9E.1070102@suse.de> diff --git a/a/1.txt b/N1/1.txt index a95ad76..c171b91 100644 --- a/a/1.txt +++ b/N1/1.txt @@ -40,7 +40,7 @@ Also, please only fetch the last instruction if debugging is active. > case BOOKE_INTERRUPT_PROGRAM: > - if (vcpu->arch.shared->msr & (MSR_PR | MSR_GS)) { > + if ((vcpu->arch.shared->msr & (MSR_PR | MSR_GS)) && -> + (last_inst = KVMPPC_INST_SW_BREAKPOINT)) { +> + (last_inst == KVMPPC_INST_SW_BREAKPOINT)) { I think this is changing the logic from "if the guest is in user mode or we're in HV, deflect" to "if the guest is in user mode or an HV guest diff --git a/a/content_digest b/N1/content_digest index fbaa1b1..c3918eb 100644 --- a/a/content_digest +++ b/N1/content_digest @@ -2,14 +2,14 @@ "ref\01410107494-25556-3-git-send-email-maddy@linux.vnet.ibm.com\0" "From\0Alexander Graf <agraf@suse.de>\0" "Subject\0Re: [PATCH 2/2 v5] powerpc/kvm: common sw breakpoint instr across ppc\0" - "Date\0Mon, 08 Sep 2014 13:09:50 +0000\0" + "Date\0Mon, 08 Sep 2014 15:09:50 +0200\0" "To\0Madhavan Srinivasan <maddy@linux.vnet.ibm.com>" benh@kernel.crashing.org paulus@samba.org " mpe@ellerman.id.au\0" "Cc\0linuxppc-dev@lists.ozlabs.org" - kvm@vger.kernel.org - " kvm-ppc@vger.kernel.org\0" + kvm-ppc@vger.kernel.org + " kvm@vger.kernel.org\0" "\00:1\0" "b\0" "\n" @@ -54,7 +54,7 @@ "> \tcase BOOKE_INTERRUPT_PROGRAM:\n" "> -\t\tif (vcpu->arch.shared->msr & (MSR_PR | MSR_GS)) {\n" "> +\t\tif ((vcpu->arch.shared->msr & (MSR_PR | MSR_GS)) &&\n" - "> +\t\t\t(last_inst = KVMPPC_INST_SW_BREAKPOINT)) {\n" + "> +\t\t\t(last_inst == KVMPPC_INST_SW_BREAKPOINT)) {\n" "\n" "I think this is changing the logic from \"if the guest is in user mode or\n" "we're in HV, deflect\" to \"if the guest is in user mode or an HV guest\n" @@ -98,4 +98,4 @@ "> \t\tval = get_reg_val(reg->id, vcpu->arch.vrsave);\n" > -d362fc656967bcf9ff5663a2dc7116dcbddf9d2df10de26684c58fb89b50429a +91725ac1203a94dcd52827cce08f311631428acdcf9509c3e846cd904d830edc
diff --git a/a/1.txt b/N2/1.txt index a95ad76..c171b91 100644 --- a/a/1.txt +++ b/N2/1.txt @@ -40,7 +40,7 @@ Also, please only fetch the last instruction if debugging is active. > case BOOKE_INTERRUPT_PROGRAM: > - if (vcpu->arch.shared->msr & (MSR_PR | MSR_GS)) { > + if ((vcpu->arch.shared->msr & (MSR_PR | MSR_GS)) && -> + (last_inst = KVMPPC_INST_SW_BREAKPOINT)) { +> + (last_inst == KVMPPC_INST_SW_BREAKPOINT)) { I think this is changing the logic from "if the guest is in user mode or we're in HV, deflect" to "if the guest is in user mode or an HV guest diff --git a/a/content_digest b/N2/content_digest index fbaa1b1..1041a0e 100644 --- a/a/content_digest +++ b/N2/content_digest @@ -2,7 +2,7 @@ "ref\01410107494-25556-3-git-send-email-maddy@linux.vnet.ibm.com\0" "From\0Alexander Graf <agraf@suse.de>\0" "Subject\0Re: [PATCH 2/2 v5] powerpc/kvm: common sw breakpoint instr across ppc\0" - "Date\0Mon, 08 Sep 2014 13:09:50 +0000\0" + "Date\0Mon, 08 Sep 2014 15:09:50 +0200\0" "To\0Madhavan Srinivasan <maddy@linux.vnet.ibm.com>" benh@kernel.crashing.org paulus@samba.org @@ -54,7 +54,7 @@ "> \tcase BOOKE_INTERRUPT_PROGRAM:\n" "> -\t\tif (vcpu->arch.shared->msr & (MSR_PR | MSR_GS)) {\n" "> +\t\tif ((vcpu->arch.shared->msr & (MSR_PR | MSR_GS)) &&\n" - "> +\t\t\t(last_inst = KVMPPC_INST_SW_BREAKPOINT)) {\n" + "> +\t\t\t(last_inst == KVMPPC_INST_SW_BREAKPOINT)) {\n" "\n" "I think this is changing the logic from \"if the guest is in user mode or\n" "we're in HV, deflect\" to \"if the guest is in user mode or an HV guest\n" @@ -98,4 +98,4 @@ "> \t\tval = get_reg_val(reg->id, vcpu->arch.vrsave);\n" > -d362fc656967bcf9ff5663a2dc7116dcbddf9d2df10de26684c58fb89b50429a +3a14cc32d3842d0650a2840f4f8a9cbb6bd47a3a0aac1ffcbdeca3939f9e4da2
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.