diff for duplicates of <540EAF14.8050201@linux.vnet.ibm.com> diff --git a/a/1.txt b/N1/1.txt index ebf78bf..8fbdffc 100644 --- a/a/1.txt +++ b/N1/1.txt @@ -47,7 +47,7 @@ Will change it. >> 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 d0efecc..0803cee 100644 --- a/a/content_digest +++ b/N1/content_digest @@ -3,7 +3,7 @@ "ref\0540DAA9E.1070102@suse.de\0" "From\0Madhavan Srinivasan <maddy@linux.vnet.ibm.com>\0" "Subject\0Re: [PATCH 2/2 v5] powerpc/kvm: common sw breakpoint instr across ppc\0" - "Date\0Tue, 09 Sep 2014 07:53:08 +0000\0" + "Date\0Tue, 09 Sep 2014 13:11:08 +0530\0" "To\0Alexander Graf <agraf@suse.de>" benh@kernel.crashing.org paulus@samba.org @@ -62,7 +62,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" @@ -115,4 +115,4 @@ ">>\n" > -eaaf657cce4bfe1762858881bf318120c8b459a6977c74b8be58d3b6aedc0d8f +dff0631befed73ececa6deb6ac067471aaf0e42f60c8960da7400f2f6ce4450d
diff --git a/a/1.txt b/N2/1.txt index ebf78bf..229cda2 100644 --- a/a/1.txt +++ b/N2/1.txt @@ -47,7 +47,7 @@ Will change it. >> 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 @@ -98,4 +98,9 @@ Maddy >> case KVM_REG_PPC_VRSAVE: >> val = get_reg_val(reg->id, vcpu->arch.vrsave); >> -> +> + +_______________________________________________ +Linuxppc-dev mailing list +Linuxppc-dev@lists.ozlabs.org +https://lists.ozlabs.org/listinfo/linuxppc-dev diff --git a/a/content_digest b/N2/content_digest index d0efecc..f311d35 100644 --- a/a/content_digest +++ b/N2/content_digest @@ -3,7 +3,7 @@ "ref\0540DAA9E.1070102@suse.de\0" "From\0Madhavan Srinivasan <maddy@linux.vnet.ibm.com>\0" "Subject\0Re: [PATCH 2/2 v5] powerpc/kvm: common sw breakpoint instr across ppc\0" - "Date\0Tue, 09 Sep 2014 07:53:08 +0000\0" + "Date\0Tue, 09 Sep 2014 13:11:08 +0530\0" "To\0Alexander Graf <agraf@suse.de>" benh@kernel.crashing.org paulus@samba.org @@ -62,7 +62,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" @@ -113,6 +113,11 @@ ">> \tcase KVM_REG_PPC_VRSAVE:\n" ">> \t\tval = get_reg_val(reg->id, vcpu->arch.vrsave);\n" ">>\n" - > + "> \n" + "\n" + "_______________________________________________\n" + "Linuxppc-dev mailing list\n" + "Linuxppc-dev@lists.ozlabs.org\n" + https://lists.ozlabs.org/listinfo/linuxppc-dev -eaaf657cce4bfe1762858881bf318120c8b459a6977c74b8be58d3b6aedc0d8f +d034b6ea35518e88c5adef9fa06c84ebc5f694c14ff6790bb2dc877f837248d4
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.