On 11/04/2018 09:16, hu huajun wrote:
> In arch/x86/kvm/trace.h, this function is declared as host_irq the
> first input, and vcpu_id the second, instead of otherwise.
>
> Signed-off-by: hu huajun <huhuajun@xxxxxxxxxxxxxxxxx>
> ---
> arch/x86/kvm/svm.c | 5 ++---
> arch/x86/kvm/vmx.c | 2 +-
> 2 files changed, 3 insertions(+), 4 deletions(-)
>
> diff --git a/arch/x86/kvm/svm.c b/arch/x86/kvm/svm.c
> index be9c839..f4e9fb4 100644
> --- a/arch/x86/kvm/svm.c
> +++ b/arch/x86/kvm/svm.c
> @@ -5118,9 +5118,8 @@ static int svm_update_pi_irte(struct kvm *kvm, unsigned int host_irq,
> }
>
> if (!ret && svm) {
> - trace_kvm_pi_irte_update(svm->vcpu.vcpu_id,
> - host_irq, e->gsi,
> - vcpu_info.vector,
> + trace_kvm_pi_irte_update(host_irq, svm->vcpu.vcpu_id,
> + e->gsi, vcpu_info.vector,
> vcpu_info.pi_desc_addr, set);
> }
>
> diff --git a/arch/x86/kvm/vmx.c b/arch/x86/kvm/vmx.c
> index f0fd50b..86fd775 100644
> --- a/arch/x86/kvm/vmx.c
> +++ b/arch/x86/kvm/vmx.c
> @@ -12204,7 +12204,7 @@ static int vmx_update_pi_irte(struct kvm *kvm, unsigned int host_irq,
> vcpu_info.pi_desc_addr = __pa(vcpu_to_pi_desc(vcpu));
> vcpu_info.vector = irq.vector;
>
> - trace_kvm_pi_irte_update(vcpu->vcpu_id, host_irq, e->gsi,
> + trace_kvm_pi_irte_update(host_irq, vcpu->vcpu_id, e->gsi,
> vcpu_info.vector, vcpu_info.pi_desc_addr, set);
>
> if (set)
>
Applied, thanks!
Paolo
