* [PATCH] KVM: X86: fix incorrect reference of trace_kvm_pi_irte_update
@ 2018-04-11 7:16 hu huajun
2018-04-11 11:34 ` Paolo Bonzini
0 siblings, 1 reply; 2+ messages in thread
From: hu huajun @ 2018-04-11 7:16 UTC (permalink / raw)
To: joro, pbonzini, rkrcmar, tglx, mingo, hpa
Cc: x86, kvm, linux-kernel, hu huajun
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@linux.alibaba.com>
---
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)
--
1.8.3.1
^ permalink raw reply related [flat|nested] 2+ messages in thread
* Re: [PATCH] KVM: X86: fix incorrect reference of trace_kvm_pi_irte_update
2018-04-11 7:16 [PATCH] KVM: X86: fix incorrect reference of trace_kvm_pi_irte_update hu huajun
@ 2018-04-11 11:34 ` Paolo Bonzini
0 siblings, 0 replies; 2+ messages in thread
From: Paolo Bonzini @ 2018-04-11 11:34 UTC (permalink / raw)
To: hu huajun, joro, rkrcmar, tglx, mingo, hpa; +Cc: x86, kvm, linux-kernel
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@linux.alibaba.com>
> ---
> 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
^ permalink raw reply [flat|nested] 2+ messages in thread
end of thread, other threads:[~2018-04-11 11:35 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2018-04-11 7:16 [PATCH] KVM: X86: fix incorrect reference of trace_kvm_pi_irte_update hu huajun
2018-04-11 11:34 ` Paolo Bonzini
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).