diff for duplicates of <1410107494-25556-2-git-send-email-maddy@linux.vnet.ibm.com> diff --git a/a/1.txt b/N1/1.txt index 6f2ef5f..dd549da 100644 --- a/a/1.txt +++ b/N1/1.txt @@ -57,14 +57,15 @@ index 27cced9..3a2414c 100644 +{ + u32 last_inst; + -+ if(kvmppc_get_last_inst(vcpu, INST_GENERIC, &last_inst) !+ EMULATE_DONE) { ++ if(kvmppc_get_last_inst(vcpu, INST_GENERIC, &last_inst) != ++ EMULATE_DONE) { + /* + * Fetch failed, so return to guest and + * try executing it again. + */ + return RESUME_GUEST; + } else { -+ if (last_inst = KVMPPC_INST_SW_BREAKPOINT) { ++ if (last_inst == KVMPPC_INST_SW_BREAKPOINT) { + run->exit_reason = KVM_EXIT_DEBUG; + run->debug.arch.address = kvmppc_get_pc(vcpu); + return RESUME_HOST; @@ -138,7 +139,7 @@ index e96b50d..30f326b 100644 + * Instruction with primary opcode 0. Based on PowerISA + * these are illegal instructions. + */ -+ if(inst = KVMPPC_INST_SW_BREAKPOINT) { ++ if(inst == KVMPPC_INST_SW_BREAKPOINT) { + run->exit_reason = KVM_EXIT_DEBUG; + run->debug.arch.address = kvmppc_get_pc(vcpu); + emulated = EMULATE_EXIT_USER; diff --git a/a/content_digest b/N1/content_digest index 7c8e211..5915e90 100644 --- a/a/content_digest +++ b/N1/content_digest @@ -1,15 +1,15 @@ "ref\01410107494-25556-1-git-send-email-maddy@linux.vnet.ibm.com\0" "From\0Madhavan Srinivasan <maddy@linux.vnet.ibm.com>\0" "Subject\0[PATCH 1/2 v5] powerpc/kvm: support to handle sw breakpoint\0" - "Date\0Sun, 07 Sep 2014 16:43:32 +0000\0" + "Date\0Sun, 7 Sep 2014 22:01:32 +0530\0" "To\0agraf@suse.de" benh@kernel.crashing.org paulus@samba.org " mpe@ellerman.id.au\0" - "Cc\0linuxppc-dev@lists.ozlabs.org" - kvm@vger.kernel.org + "Cc\0Madhavan Srinivasan <maddy@linux.vnet.ibm.com>" + linuxppc-dev@lists.ozlabs.org kvm-ppc@vger.kernel.org - " Madhavan Srinivasan <maddy@linux.vnet.ibm.com>\0" + " kvm@vger.kernel.org\0" "\00:1\0" "b\0" "This patch adds kernel side support for software breakpoint.\n" @@ -71,14 +71,15 @@ "+{\n" "+\tu32 last_inst;\n" "+\n" - "+\tif(kvmppc_get_last_inst(vcpu, INST_GENERIC, &last_inst) !+\t\t\t\t\tEMULATE_DONE) {\n" + "+\tif(kvmppc_get_last_inst(vcpu, INST_GENERIC, &last_inst) !=\n" + "+\t\t\t\t\tEMULATE_DONE) {\n" "+\t\t/*\n" "+\t\t * Fetch failed, so return to guest and\n" "+\t\t * try executing it again.\n" "+\t\t */\n" "+\t\treturn RESUME_GUEST;\n" "+\t} else {\n" - "+\t\tif (last_inst = KVMPPC_INST_SW_BREAKPOINT) {\n" + "+\t\tif (last_inst == KVMPPC_INST_SW_BREAKPOINT) {\n" "+\t\t\trun->exit_reason = KVM_EXIT_DEBUG;\n" "+\t\t\trun->debug.arch.address = kvmppc_get_pc(vcpu);\n" "+\t\t\treturn RESUME_HOST;\n" @@ -152,7 +153,7 @@ "+\t\t * Instruction with primary opcode 0. Based on PowerISA\n" "+\t\t * these are illegal instructions.\n" "+\t\t */\n" - "+\t\tif(inst = KVMPPC_INST_SW_BREAKPOINT) {\n" + "+\t\tif(inst == KVMPPC_INST_SW_BREAKPOINT) {\n" "+\t\t\trun->exit_reason = KVM_EXIT_DEBUG;\n" "+\t\t\trun->debug.arch.address = kvmppc_get_pc(vcpu);\n" "+\t\t\temulated = EMULATE_EXIT_USER;\n" @@ -171,4 +172,4 @@ "-- \n" 1.7.11.4 -8e9d3308c876cf1374805f8b8c0cb95c385eebec9eea0a784a9ffb638651bd09 +8797d4f00fe02cb6805a744bea0481142318dcd8b0801651fbaa5c355933f321
diff --git a/a/1.txt b/N2/1.txt index 6f2ef5f..dd549da 100644 --- a/a/1.txt +++ b/N2/1.txt @@ -57,14 +57,15 @@ index 27cced9..3a2414c 100644 +{ + u32 last_inst; + -+ if(kvmppc_get_last_inst(vcpu, INST_GENERIC, &last_inst) !+ EMULATE_DONE) { ++ if(kvmppc_get_last_inst(vcpu, INST_GENERIC, &last_inst) != ++ EMULATE_DONE) { + /* + * Fetch failed, so return to guest and + * try executing it again. + */ + return RESUME_GUEST; + } else { -+ if (last_inst = KVMPPC_INST_SW_BREAKPOINT) { ++ if (last_inst == KVMPPC_INST_SW_BREAKPOINT) { + run->exit_reason = KVM_EXIT_DEBUG; + run->debug.arch.address = kvmppc_get_pc(vcpu); + return RESUME_HOST; @@ -138,7 +139,7 @@ index e96b50d..30f326b 100644 + * Instruction with primary opcode 0. Based on PowerISA + * these are illegal instructions. + */ -+ if(inst = KVMPPC_INST_SW_BREAKPOINT) { ++ if(inst == KVMPPC_INST_SW_BREAKPOINT) { + run->exit_reason = KVM_EXIT_DEBUG; + run->debug.arch.address = kvmppc_get_pc(vcpu); + emulated = EMULATE_EXIT_USER; diff --git a/a/content_digest b/N2/content_digest index 7c8e211..92b023e 100644 --- a/a/content_digest +++ b/N2/content_digest @@ -1,7 +1,7 @@ "ref\01410107494-25556-1-git-send-email-maddy@linux.vnet.ibm.com\0" "From\0Madhavan Srinivasan <maddy@linux.vnet.ibm.com>\0" "Subject\0[PATCH 1/2 v5] powerpc/kvm: support to handle sw breakpoint\0" - "Date\0Sun, 07 Sep 2014 16:43:32 +0000\0" + "Date\0Sun, 7 Sep 2014 22:01:32 +0530\0" "To\0agraf@suse.de" benh@kernel.crashing.org paulus@samba.org @@ -71,14 +71,15 @@ "+{\n" "+\tu32 last_inst;\n" "+\n" - "+\tif(kvmppc_get_last_inst(vcpu, INST_GENERIC, &last_inst) !+\t\t\t\t\tEMULATE_DONE) {\n" + "+\tif(kvmppc_get_last_inst(vcpu, INST_GENERIC, &last_inst) !=\n" + "+\t\t\t\t\tEMULATE_DONE) {\n" "+\t\t/*\n" "+\t\t * Fetch failed, so return to guest and\n" "+\t\t * try executing it again.\n" "+\t\t */\n" "+\t\treturn RESUME_GUEST;\n" "+\t} else {\n" - "+\t\tif (last_inst = KVMPPC_INST_SW_BREAKPOINT) {\n" + "+\t\tif (last_inst == KVMPPC_INST_SW_BREAKPOINT) {\n" "+\t\t\trun->exit_reason = KVM_EXIT_DEBUG;\n" "+\t\t\trun->debug.arch.address = kvmppc_get_pc(vcpu);\n" "+\t\t\treturn RESUME_HOST;\n" @@ -152,7 +153,7 @@ "+\t\t * Instruction with primary opcode 0. Based on PowerISA\n" "+\t\t * these are illegal instructions.\n" "+\t\t */\n" - "+\t\tif(inst = KVMPPC_INST_SW_BREAKPOINT) {\n" + "+\t\tif(inst == KVMPPC_INST_SW_BREAKPOINT) {\n" "+\t\t\trun->exit_reason = KVM_EXIT_DEBUG;\n" "+\t\t\trun->debug.arch.address = kvmppc_get_pc(vcpu);\n" "+\t\t\temulated = EMULATE_EXIT_USER;\n" @@ -171,4 +172,4 @@ "-- \n" 1.7.11.4 -8e9d3308c876cf1374805f8b8c0cb95c385eebec9eea0a784a9ffb638651bd09 +a8e4df6d4b1e070659b1d8c35ee4e4eae4c9a67be26f9b1a5c4ae05405123dce
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.