diff for duplicates of <515AFC26.5040705@suse.de> diff --git a/a/1.txt b/N1/1.txt index 67d2bce..fb65417 100644 --- a/a/1.txt +++ b/N1/1.txt @@ -293,7 +293,7 @@ bisectability suffers. >>>>> - >>>>> - run->exit_reason = KVM_EXIT_DEBUG; >>>>> + r = kvmppc_handle_debug(run, vcpu); ->>>>> + if (r = RESUME_HOST) +>>>>> + if (r == RESUME_HOST) >>>>> + run->exit_reason = KVM_EXIT_DEBUG; >>>>> kvmppc_account_exit(vcpu, DEBUG_EXITS); >>>>> - r = RESUME_HOST; diff --git a/a/content_digest b/N1/content_digest index 2667c07..ee4a045 100644 --- a/a/content_digest +++ b/N1/content_digest @@ -5,7 +5,7 @@ "ref\06A3DF150A5B70D4F9B66A25E3F7C888D06FBBF38@039-SN2MPN1-013.039d.mgd.msft.net\0" "From\0Alexander Graf <agraf@suse.de>\0" "Subject\0Re: [PATCH 4/4 v2] KVM: PPC: Add userspace debug stub support\0" - "Date\0Tue, 02 Apr 2013 15:41:26 +0000\0" + "Date\0Tue, 02 Apr 2013 17:41:26 +0200\0" "To\0Bhushan Bharat-R65777 <R65777@freescale.com>\0" "Cc\0kvm-ppc@vger.kernel.org <kvm-ppc@vger.kernel.org>" kvm@vger.kernel.org <kvm@vger.kernel.org> @@ -307,7 +307,7 @@ ">>>>> -\n" ">>>>> -\t\trun->exit_reason = KVM_EXIT_DEBUG;\n" ">>>>> +\t\tr = kvmppc_handle_debug(run, vcpu);\n" - ">>>>> +\t\tif (r = RESUME_HOST)\n" + ">>>>> +\t\tif (r == RESUME_HOST)\n" ">>>>> +\t\t\trun->exit_reason = KVM_EXIT_DEBUG;\n" ">>>>> \t\tkvmppc_account_exit(vcpu, DEBUG_EXITS);\n" ">>>>> -\t\tr = RESUME_HOST;\n" @@ -509,4 +509,4 @@ "\n" Alex -093df32704287ae43600132a4eebec74618ad861bfdc2853ea1cc25515636d5b +e5f4cf8780c7ba37e7520c82c15d1d113243285288f6c1441cbc4e680c13ff83
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.