diff for duplicates of <53F86A4A.6080303@linux.vnet.ibm.com> diff --git a/a/1.txt b/N1/1.txt index 05377ce..338ad5e 100644 --- a/a/1.txt +++ b/N1/1.txt @@ -108,7 +108,8 @@ Will change it. >> - r = RESUME_GUEST; >> + { >> + 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) { > > Please only do this if debugging is active. > @@ -122,7 +123,7 @@ instruction check there. >> + */ >> + r = RESUME_GUEST; >> + } else { ->> + if (last_inst = KVMPPC_INST_BOOK3S_DEBUG) { +>> + if (last_inst == KVMPPC_INST_BOOK3S_DEBUG) { >> + kvmppc_emulate_debug_instruction_hv(run, vcpu); >> + r = RESUME_HOST; >> + } else { diff --git a/a/content_digest b/N1/content_digest index 65877de..9a44a05 100644 --- a/a/content_digest +++ b/N1/content_digest @@ -2,14 +2,14 @@ "ref\053F5B77D.3000007@suse.de\0" "From\0Madhavan Srinivasan <maddy@linux.vnet.ibm.com>\0" "Subject\0Re: [PATCH v4] powerpc/kvm: support to handle sw breakpoint\0" - "Date\0Sat, 23 Aug 2014 10:29:46 +0000\0" + "Date\0Sat, 23 Aug 2014 15:47:46 +0530\0" "To\0Alexander Graf <agraf@suse.de>" 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" "On Thursday 21 August 2014 02:40 PM, Alexander Graf wrote:\n" @@ -122,7 +122,8 @@ ">> -\t\tr = RESUME_GUEST;\n" ">> +\t{\n" ">> +\t\tu32 last_inst;\n" - ">> +\t\tif(kvmppc_get_last_inst(vcpu, INST_GENERIC, &last_inst) !>> +\t\t\t\t\tEMULATE_DONE) {\n" + ">> +\t\tif(kvmppc_get_last_inst(vcpu, INST_GENERIC, &last_inst) !=\n" + ">> +\t\t\t\t\tEMULATE_DONE) {\n" "> \n" "> Please only do this if debugging is active.\n" "> \n" @@ -136,7 +137,7 @@ ">> +\t\t\t */\n" ">> +\t\t\tr = RESUME_GUEST;\n" ">> +\t\t} else {\n" - ">> +\t\t\tif (last_inst = KVMPPC_INST_BOOK3S_DEBUG) {\n" + ">> +\t\t\tif (last_inst == KVMPPC_INST_BOOK3S_DEBUG) {\n" ">> +\t\t\t\tkvmppc_emulate_debug_instruction_hv(run, vcpu);\n" ">> +\t\t\t\tr = RESUME_HOST;\n" ">> +\t\t\t} else {\n" @@ -211,4 +212,4 @@ ">>\n" > -958d8eaf2a7a2aa5cc545d20714b528f0c5487d822d1a6b3ebb2f00157f5aad9 +29ba07b152a2596889048c295d5ae21326762e6260d6c341b93feba499b19881
diff --git a/a/1.txt b/N2/1.txt index 05377ce..338ad5e 100644 --- a/a/1.txt +++ b/N2/1.txt @@ -108,7 +108,8 @@ Will change it. >> - r = RESUME_GUEST; >> + { >> + 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) { > > Please only do this if debugging is active. > @@ -122,7 +123,7 @@ instruction check there. >> + */ >> + r = RESUME_GUEST; >> + } else { ->> + if (last_inst = KVMPPC_INST_BOOK3S_DEBUG) { +>> + if (last_inst == KVMPPC_INST_BOOK3S_DEBUG) { >> + kvmppc_emulate_debug_instruction_hv(run, vcpu); >> + r = RESUME_HOST; >> + } else { diff --git a/a/content_digest b/N2/content_digest index 65877de..88ccc28 100644 --- a/a/content_digest +++ b/N2/content_digest @@ -2,7 +2,7 @@ "ref\053F5B77D.3000007@suse.de\0" "From\0Madhavan Srinivasan <maddy@linux.vnet.ibm.com>\0" "Subject\0Re: [PATCH v4] powerpc/kvm: support to handle sw breakpoint\0" - "Date\0Sat, 23 Aug 2014 10:29:46 +0000\0" + "Date\0Sat, 23 Aug 2014 15:47:46 +0530\0" "To\0Alexander Graf <agraf@suse.de>" benh@kernel.crashing.org paulus@samba.org @@ -122,7 +122,8 @@ ">> -\t\tr = RESUME_GUEST;\n" ">> +\t{\n" ">> +\t\tu32 last_inst;\n" - ">> +\t\tif(kvmppc_get_last_inst(vcpu, INST_GENERIC, &last_inst) !>> +\t\t\t\t\tEMULATE_DONE) {\n" + ">> +\t\tif(kvmppc_get_last_inst(vcpu, INST_GENERIC, &last_inst) !=\n" + ">> +\t\t\t\t\tEMULATE_DONE) {\n" "> \n" "> Please only do this if debugging is active.\n" "> \n" @@ -136,7 +137,7 @@ ">> +\t\t\t */\n" ">> +\t\t\tr = RESUME_GUEST;\n" ">> +\t\t} else {\n" - ">> +\t\t\tif (last_inst = KVMPPC_INST_BOOK3S_DEBUG) {\n" + ">> +\t\t\tif (last_inst == KVMPPC_INST_BOOK3S_DEBUG) {\n" ">> +\t\t\t\tkvmppc_emulate_debug_instruction_hv(run, vcpu);\n" ">> +\t\t\t\tr = RESUME_HOST;\n" ">> +\t\t\t} else {\n" @@ -211,4 +212,4 @@ ">>\n" > -958d8eaf2a7a2aa5cc545d20714b528f0c5487d822d1a6b3ebb2f00157f5aad9 +871eba5747240649b2914e4dd9a06b7b9f8c77e07f00b516ac9c97e6fe7fcaf4
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.