diff for duplicates of <53F5B77D.3000007@suse.de> diff --git a/a/1.txt b/N1/1.txt index 832327c..8134001 100644 --- a/a/1.txt +++ b/N1/1.txt @@ -100,7 +100,8 @@ This comment is no longer true, it should get changed. > - 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. @@ -110,7 +111,7 @@ Please only do this if debugging is active. > + */ > + 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 613b3c8..c1c299b 100644 --- a/a/content_digest +++ b/N1/content_digest @@ -1,14 +1,14 @@ "ref\01408513929-5267-1-git-send-email-maddy@linux.vnet.ibm.com\0" "From\0Alexander Graf <agraf@suse.de>\0" "Subject\0Re: [PATCH v4] powerpc/kvm: support to handle sw breakpoint\0" - "Date\0Thu, 21 Aug 2014 09:10:21 +0000\0" + "Date\0Thu, 21 Aug 2014 11:10:21 +0200\0" "To\0Madhavan Srinivasan <maddy@linux.vnet.ibm.com>" 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" "\n" @@ -113,7 +113,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" @@ -123,7 +124,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" @@ -191,4 +192,4 @@ "> \t}\n" > -928469fe14f1479985c81a32d0bec5b1254402583dbc26ef29e1760266039f42 +fb5b8a903f757f37cf87e1a12daa47c7be5f191f42aa9d3206452f4f71f98424
diff --git a/a/1.txt b/N2/1.txt index 832327c..8134001 100644 --- a/a/1.txt +++ b/N2/1.txt @@ -100,7 +100,8 @@ This comment is no longer true, it should get changed. > - 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. @@ -110,7 +111,7 @@ Please only do this if debugging is active. > + */ > + 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 613b3c8..8d80e8f 100644 --- a/a/content_digest +++ b/N2/content_digest @@ -1,7 +1,7 @@ "ref\01408513929-5267-1-git-send-email-maddy@linux.vnet.ibm.com\0" "From\0Alexander Graf <agraf@suse.de>\0" "Subject\0Re: [PATCH v4] powerpc/kvm: support to handle sw breakpoint\0" - "Date\0Thu, 21 Aug 2014 09:10:21 +0000\0" + "Date\0Thu, 21 Aug 2014 11:10:21 +0200\0" "To\0Madhavan Srinivasan <maddy@linux.vnet.ibm.com>" benh@kernel.crashing.org paulus@samba.org @@ -113,7 +113,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" @@ -123,7 +124,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" @@ -191,4 +192,4 @@ "> \t}\n" > -928469fe14f1479985c81a32d0bec5b1254402583dbc26ef29e1760266039f42 +dc50957adb741af707661e2b5e4f2cf994dab6c871412819cbd6c338d70d741f
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.