diff for duplicates of <546DD9B6.6080608@suse.de> diff --git a/a/1.txt b/N1/1.txt index 2af2a18..63a0268 100644 --- a/a/1.txt +++ b/N1/1.txt @@ -161,11 +161,11 @@ On 19.11.14 22:54, Suresh E. Warrier wrote: >>> vcpu->arch.ret = RESUME_GUEST; >>> vcpu->arch.trap = 0; >>> @@ -1825,6 +1840,7 @@ static int kvmppc_run_vcpu(struct kvm_run *kvm_run, struct kvm_vcpu *vcpu) ->>> VCORE_EXIT_COUNT(vc) = 0) { +>>> VCORE_EXIT_COUNT(vc) == 0) { >>> kvmppc_create_dtl_entry(vcpu, vc); >>> kvmppc_start_thread(vcpu); >>> + trace_kvm_guest_enter(vcpu); ->>> } else if (vc->vcore_state = VCORE_SLEEPING) { +>>> } else if (vc->vcore_state == VCORE_SLEEPING) { >>> wake_up(&vc->wq); >>> } >>> @@ -1889,6 +1905,7 @@ static int kvmppc_run_vcpu(struct kvm_run *kvm_run, struct kvm_vcpu *vcpu) @@ -178,13 +178,13 @@ On 19.11.14 22:54, Suresh E. Warrier wrote: >>> } >>> @@ -1934,7 +1951,9 @@ static int kvmppc_vcpu_run_hv(struct kvm_run *run, struct kvm_vcpu *vcpu) >>> ->>> if (run->exit_reason = KVM_EXIT_PAPR_HCALL && +>>> if (run->exit_reason == KVM_EXIT_PAPR_HCALL && >>> !(vcpu->arch.shregs.msr & MSR_PR)) { >>> + trace_kvm_hcall_enter(vcpu); >>> r = kvmppc_pseries_do_hcall(vcpu); >>> + trace_kvm_hcall_exit(vcpu, r); >>> kvmppc_core_prepare_to_enter(vcpu); ->>> } else if (r = RESUME_PAGE_FAULT) { +>>> } else if (r == RESUME_PAGE_FAULT) { >>> srcu_idx = srcu_read_lock(&vcpu->kvm->srcu); >>> diff --git a/arch/powerpc/kvm/trace_hv.h b/arch/powerpc/kvm/trace_hv.h >>> new file mode 100644 diff --git a/a/content_digest b/N1/content_digest index c969e4b..9ed0974 100644 --- a/a/content_digest +++ b/N1/content_digest @@ -3,7 +3,7 @@ "ref\0546D119B.1000809@linux.vnet.ibm.com\0" "From\0Alexander Graf <agraf@suse.de>\0" "Subject\0Re: [PATCH] KVM: PPC: Book3S HV: Tracepoints for KVM HV guest interactions\0" - "Date\0Thu, 20 Nov 2014 12:08:22 +0000\0" + "Date\0Thu, 20 Nov 2014 13:08:22 +0100\0" "To\0Suresh E. Warrier <warrier@linux.vnet.ibm.com>\0" "Cc\0kvm-ppc@vger.kernel.org <kvm-ppc@vger.kernel.org>" kvm@vger.kernel.org <kvm@vger.kernel.org> @@ -173,11 +173,11 @@ ">>> vcpu->arch.ret = RESUME_GUEST;\n" ">>> vcpu->arch.trap = 0;\n" ">>> @@ -1825,6 +1840,7 @@ static int kvmppc_run_vcpu(struct kvm_run *kvm_run, struct kvm_vcpu *vcpu)\n" - ">>> VCORE_EXIT_COUNT(vc) = 0) {\n" + ">>> VCORE_EXIT_COUNT(vc) == 0) {\n" ">>> kvmppc_create_dtl_entry(vcpu, vc);\n" ">>> kvmppc_start_thread(vcpu);\n" ">>> + trace_kvm_guest_enter(vcpu);\n" - ">>> } else if (vc->vcore_state = VCORE_SLEEPING) {\n" + ">>> } else if (vc->vcore_state == VCORE_SLEEPING) {\n" ">>> wake_up(&vc->wq);\n" ">>> }\n" ">>> @@ -1889,6 +1905,7 @@ static int kvmppc_run_vcpu(struct kvm_run *kvm_run, struct kvm_vcpu *vcpu)\n" @@ -190,13 +190,13 @@ ">>> }\n" ">>> @@ -1934,7 +1951,9 @@ static int kvmppc_vcpu_run_hv(struct kvm_run *run, struct kvm_vcpu *vcpu)\n" ">>>\n" - ">>> if (run->exit_reason = KVM_EXIT_PAPR_HCALL &&\n" + ">>> if (run->exit_reason == KVM_EXIT_PAPR_HCALL &&\n" ">>> !(vcpu->arch.shregs.msr & MSR_PR)) {\n" ">>> + trace_kvm_hcall_enter(vcpu);\n" ">>> r = kvmppc_pseries_do_hcall(vcpu);\n" ">>> + trace_kvm_hcall_exit(vcpu, r);\n" ">>> kvmppc_core_prepare_to_enter(vcpu);\n" - ">>> } else if (r = RESUME_PAGE_FAULT) {\n" + ">>> } else if (r == RESUME_PAGE_FAULT) {\n" ">>> srcu_idx = srcu_read_lock(&vcpu->kvm->srcu);\n" ">>> diff --git a/arch/powerpc/kvm/trace_hv.h b/arch/powerpc/kvm/trace_hv.h\n" ">>> new file mode 100644\n" @@ -249,4 +249,4 @@ "\n" Alex -3c290472a7dab68fd70ebda6bc2c7166cccdccf267785e24515f7e50ba5f0989 +d3ab38fa10cebb831859c657326fc4cdd9300e43c000c9d0372660f08dc5f14f
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.