diff for duplicates of <53E87023.6080200@suse.de> diff --git a/a/1.txt b/N1/1.txt index cbccf6f..5464249 100644 --- a/a/1.txt +++ b/N1/1.txt @@ -87,7 +87,7 @@ On 01.08.14 06:50, Madhavan Srinivasan wrote: > case BOOK3S_INTERRUPT_H_EMUL_ASSIST: > - kvmppc_core_queue_program(vcpu, SRR1_PROGILL); > - r = RESUME_GUEST; -> + if (kvmppc_get_last_inst(vcpu) = KVMPPC_INST_BOOK3S_DEBUG) { +> + if (kvmppc_get_last_inst(vcpu) == KVMPPC_INST_BOOK3S_DEBUG) { > + kvmppc_emulate_instruction(run, vcpu); I changed the emulation code flow very recently, so while I advised you diff --git a/a/content_digest b/N1/content_digest index 3e24b92..bad7980 100644 --- a/a/content_digest +++ b/N1/content_digest @@ -1,13 +1,13 @@ "ref\01406868643-26291-1-git-send-email-maddy@linux.vnet.ibm.com\0" "From\0Alexander Graf <agraf@suse.de>\0" "Subject\0Re: [PATCH v3] powerpc/kvm: support to handle sw breakpoint\0" - "Date\0Mon, 11 Aug 2014 07:26:27 +0000\0" + "Date\0Mon, 11 Aug 2014 09:26:27 +0200\0" "To\0Madhavan Srinivasan <maddy@linux.vnet.ibm.com>" benh@kernel.crashing.org " paulus@samba.org\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" @@ -99,7 +99,7 @@ "> \tcase BOOK3S_INTERRUPT_H_EMUL_ASSIST:\n" "> -\t\tkvmppc_core_queue_program(vcpu, SRR1_PROGILL);\n" "> -\t\tr = RESUME_GUEST;\n" - "> +\t\tif (kvmppc_get_last_inst(vcpu) = KVMPPC_INST_BOOK3S_DEBUG) {\n" + "> +\t\tif (kvmppc_get_last_inst(vcpu) == KVMPPC_INST_BOOK3S_DEBUG) {\n" "> +\t\t\tkvmppc_emulate_instruction(run, vcpu);\n" "\n" "I changed the emulation code flow very recently, so while I advised you \n" @@ -151,4 +151,4 @@ "\n" Alex -153caa47eb9a95f052b2d5ce9b6cd372b9d93494cc3d16374f10b19836f1ad07 +fc5f1beb3901666ec778f4a26d9f104dd5801acdbacf073c80565e50220a0f8a
diff --git a/a/1.txt b/N2/1.txt index cbccf6f..5464249 100644 --- a/a/1.txt +++ b/N2/1.txt @@ -87,7 +87,7 @@ On 01.08.14 06:50, Madhavan Srinivasan wrote: > case BOOK3S_INTERRUPT_H_EMUL_ASSIST: > - kvmppc_core_queue_program(vcpu, SRR1_PROGILL); > - r = RESUME_GUEST; -> + if (kvmppc_get_last_inst(vcpu) = KVMPPC_INST_BOOK3S_DEBUG) { +> + if (kvmppc_get_last_inst(vcpu) == KVMPPC_INST_BOOK3S_DEBUG) { > + kvmppc_emulate_instruction(run, vcpu); I changed the emulation code flow very recently, so while I advised you diff --git a/a/content_digest b/N2/content_digest index 3e24b92..5ecf2be 100644 --- a/a/content_digest +++ b/N2/content_digest @@ -1,7 +1,7 @@ "ref\01406868643-26291-1-git-send-email-maddy@linux.vnet.ibm.com\0" "From\0Alexander Graf <agraf@suse.de>\0" "Subject\0Re: [PATCH v3] powerpc/kvm: support to handle sw breakpoint\0" - "Date\0Mon, 11 Aug 2014 07:26:27 +0000\0" + "Date\0Mon, 11 Aug 2014 09:26:27 +0200\0" "To\0Madhavan Srinivasan <maddy@linux.vnet.ibm.com>" benh@kernel.crashing.org " paulus@samba.org\0" @@ -99,7 +99,7 @@ "> \tcase BOOK3S_INTERRUPT_H_EMUL_ASSIST:\n" "> -\t\tkvmppc_core_queue_program(vcpu, SRR1_PROGILL);\n" "> -\t\tr = RESUME_GUEST;\n" - "> +\t\tif (kvmppc_get_last_inst(vcpu) = KVMPPC_INST_BOOK3S_DEBUG) {\n" + "> +\t\tif (kvmppc_get_last_inst(vcpu) == KVMPPC_INST_BOOK3S_DEBUG) {\n" "> +\t\t\tkvmppc_emulate_instruction(run, vcpu);\n" "\n" "I changed the emulation code flow very recently, so while I advised you \n" @@ -151,4 +151,4 @@ "\n" Alex -153caa47eb9a95f052b2d5ce9b6cd372b9d93494cc3d16374f10b19836f1ad07 +3d9921946e80db99cd3102f9da414f4df65c36e90a9cd1fdcf6b6b7cba091f29
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.