Avi Kivity wrote:
> diff --git a/arch/x86/kvm/trace.h b/arch/x86/kvm/trace.h
> index b75efef..3cf9547 100644
> --- a/arch/x86/kvm/trace.h
> +++ b/arch/x86/kvm/trace.h
> @@ -182,8 +182,8 @@ TRACE_EVENT(kvm_apic,
> * Tracepoint for kvm guest exit:
> */
> TRACE_EVENT(kvm_exit,
> - TP_PROTO(unsigned int exit_reason, unsigned long guest_rip),
> - TP_ARGS(exit_reason, guest_rip),
> + TP_PROTO(unsigned int exit_reason, struct kvm_vcpu *vcpu),
Whitespaces were inserted by accident?
> + TP_ARGS(exit_reason, vcpu),
>
> TP_STRUCT__entry(
> __field( unsigned int, exit_reason )
> @@ -192,7 +192,7 @@ TRACE_EVENT(kvm_exit,
>
> TP_fast_assign(
> __entry->exit_reason = exit_reason;
> - __entry->guest_rip = guest_rip;
> + __entry->guest_rip = kvm_rip_read(vcpu);
> ),
>
> TP_printk("reason %s rip 0x%lx",
> diff --git a/arch/x86/kvm/vmx.c b/arch/x86/kvm/vmx.c
> index ae3217d..06108f3 100644
> --- a/arch/x86/kvm/vmx.c
> +++ b/arch/x86/kvm/vmx.c
> @@ -3605,7 +3605,7 @@ static int vmx_handle_exit(struct kvm_vcpu *vcpu)
> u32 exit_reason = vmx->exit_reason;
> u32 vectoring_info = vmx->idt_vectoring_info;
>
> - trace_kvm_exit(exit_reason, kvm_rip_read(vcpu));
> + trace_kvm_exit(exit_reason, vcpu);
>
> /* If guest state is invalid, start emulating */
> if (vmx->emulation_required && emulate_invalid_guest_state)
--
To unsubscribe from this list: send the line "unsubscribe kvm" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
