diff for duplicates of <53B64E4D.1010802@suse.de> diff --git a/a/1.txt b/N1/1.txt index 371586b..f5662ed 100644 --- a/a/1.txt +++ b/N1/1.txt @@ -105,7 +105,7 @@ appeal of intentional placement ;). >>> * we don't emulate any guest instructions at this stage. >>> */ >>> case BOOK3S_INTERRUPT_H_EMUL_ASSIST: ->>> + if (kvmppc_get_last_inst(vcpu) = KVMPPC_INST_BOOK3S_DEBUG ) { +>>> + if (kvmppc_get_last_inst(vcpu) == KVMPPC_INST_BOOK3S_DEBUG ) { >>> + run->exit_reason = KVM_EXIT_DEBUG; >>> + run->debug.arch.address = kvmppc_get_pc(vcpu); >>> + r = RESUME_HOST; diff --git a/a/content_digest b/N1/content_digest index aa7cf4d..368ff71 100644 --- a/a/content_digest +++ b/N1/content_digest @@ -3,13 +3,13 @@ "ref\053B62EEE.7010804@linux.vnet.ibm.com\0" "From\0Alexander Graf <agraf@suse.de>\0" "Subject\0Re: [PATCH v2] powerpc/kvm: support to handle sw breakpoint\0" - "Date\0Fri, 04 Jul 2014 06:48:45 +0000\0" + "Date\0Fri, 04 Jul 2014 08:48:45 +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-ppc@vger.kernel.org - " kvm@vger.kernel.org\0" + kvm@vger.kernel.org + " kvm-ppc@vger.kernel.org\0" "\00:1\0" "b\0" "\n" @@ -119,7 +119,7 @@ ">>> * we don't emulate any guest instructions at this stage.\n" ">>> */\n" ">>> case BOOK3S_INTERRUPT_H_EMUL_ASSIST:\n" - ">>> + if (kvmppc_get_last_inst(vcpu) = KVMPPC_INST_BOOK3S_DEBUG ) {\n" + ">>> + if (kvmppc_get_last_inst(vcpu) == KVMPPC_INST_BOOK3S_DEBUG ) {\n" ">>> + run->exit_reason = KVM_EXIT_DEBUG;\n" ">>> + run->debug.arch.address = kvmppc_get_pc(vcpu);\n" ">>> + r = RESUME_HOST;\n" @@ -133,4 +133,4 @@ "\n" Alex -453de3cc57bcfccc7d3d8aa41760f7375adfdced8f01c215cb61f07218e2f199 +f86200039244bd9df85ab459a8a5ad6fd6356d83176114f2a8f77a417ef3ad1b
diff --git a/a/1.txt b/N2/1.txt index 371586b..f5662ed 100644 --- a/a/1.txt +++ b/N2/1.txt @@ -105,7 +105,7 @@ appeal of intentional placement ;). >>> * we don't emulate any guest instructions at this stage. >>> */ >>> case BOOK3S_INTERRUPT_H_EMUL_ASSIST: ->>> + if (kvmppc_get_last_inst(vcpu) = KVMPPC_INST_BOOK3S_DEBUG ) { +>>> + if (kvmppc_get_last_inst(vcpu) == KVMPPC_INST_BOOK3S_DEBUG ) { >>> + run->exit_reason = KVM_EXIT_DEBUG; >>> + run->debug.arch.address = kvmppc_get_pc(vcpu); >>> + r = RESUME_HOST; diff --git a/a/content_digest b/N2/content_digest index aa7cf4d..fe8d1c5 100644 --- a/a/content_digest +++ b/N2/content_digest @@ -3,7 +3,7 @@ "ref\053B62EEE.7010804@linux.vnet.ibm.com\0" "From\0Alexander Graf <agraf@suse.de>\0" "Subject\0Re: [PATCH v2] powerpc/kvm: support to handle sw breakpoint\0" - "Date\0Fri, 04 Jul 2014 06:48:45 +0000\0" + "Date\0Fri, 04 Jul 2014 08:48:45 +0200\0" "To\0Madhavan Srinivasan <maddy@linux.vnet.ibm.com>" benh@kernel.crashing.org " paulus@samba.org\0" @@ -119,7 +119,7 @@ ">>> * we don't emulate any guest instructions at this stage.\n" ">>> */\n" ">>> case BOOK3S_INTERRUPT_H_EMUL_ASSIST:\n" - ">>> + if (kvmppc_get_last_inst(vcpu) = KVMPPC_INST_BOOK3S_DEBUG ) {\n" + ">>> + if (kvmppc_get_last_inst(vcpu) == KVMPPC_INST_BOOK3S_DEBUG ) {\n" ">>> + run->exit_reason = KVM_EXIT_DEBUG;\n" ">>> + run->debug.arch.address = kvmppc_get_pc(vcpu);\n" ">>> + r = RESUME_HOST;\n" @@ -133,4 +133,4 @@ "\n" Alex -453de3cc57bcfccc7d3d8aa41760f7375adfdced8f01c215cb61f07218e2f199 +3b9846d85a4d5cd8e7f2de9198ebd31508a486f8e6a74371fb072d3474675a92
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.