[<prev] [next>] [<thread-prev] [thread-next>] [day] [month] [year] [list]
Message-Id: <20220125095909.38122-9-cloudliang@tencent.com>
Date: Tue, 25 Jan 2022 17:58:58 +0800
From: Jinrong Liang <ljr.kernel@...il.com>
To: Paolo Bonzini <pbonzini@...hat.com>
Cc: Xianting Tian <xianting.tian@...ux.alibaba.com>,
Jim Mattson <jmattson@...gle.com>,
Sean Christopherson <seanjc@...gle.com>,
Vitaly Kuznetsov <vkuznets@...hat.com>,
Wanpeng Li <wanpengli@...cent.com>,
Joerg Roedel <joro@...tes.org>, kvm@...r.kernel.org,
linux-kernel@...r.kernel.org
Subject: [PATCH 08/19] KVM: x86: Remove unused "vcpu" of kvm_after_interrupt()
From: Jinrong Liang <cloudliang@...cent.com>
The "struct kvm_vcpu *vcpu" parameter of kvm_after_interrupt() is not used,
so remove it. No functional change intended.
Signed-off-by: Jinrong Liang <cloudliang@...cent.com>
---
arch/x86/kvm/svm/svm.c | 2 +-
arch/x86/kvm/vmx/vmx.c | 2 +-
arch/x86/kvm/x86.c | 2 +-
arch/x86/kvm/x86.h | 2 +-
4 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/arch/x86/kvm/svm/svm.c b/arch/x86/kvm/svm/svm.c
index bc733dbadbdd..744ddc7ad6ad 100644
--- a/arch/x86/kvm/svm/svm.c
+++ b/arch/x86/kvm/svm/svm.c
@@ -3737,7 +3737,7 @@ static __no_kcsan fastpath_t svm_vcpu_run(struct kvm_vcpu *vcpu)
/* Any pending NMI will happen here */
if (unlikely(svm->vmcb->control.exit_code == SVM_EXIT_NMI))
- kvm_after_interrupt(vcpu);
+ kvm_after_interrupt();
sync_cr8_to_lapic(vcpu);
diff --git a/arch/x86/kvm/vmx/vmx.c b/arch/x86/kvm/vmx/vmx.c
index a02a28ce7cc3..62b0335d9ae2 100644
--- a/arch/x86/kvm/vmx/vmx.c
+++ b/arch/x86/kvm/vmx/vmx.c
@@ -6453,7 +6453,7 @@ static void handle_interrupt_nmi_irqoff(struct kvm_vcpu *vcpu,
{
kvm_before_interrupt(vcpu);
vmx_do_interrupt_nmi_irqoff(entry);
- kvm_after_interrupt(vcpu);
+ kvm_after_interrupt();
}
static void handle_nm_fault_irqoff(struct kvm_vcpu *vcpu)
diff --git a/arch/x86/kvm/x86.c b/arch/x86/kvm/x86.c
index 55518b7d3b96..df46d0737b85 100644
--- a/arch/x86/kvm/x86.c
+++ b/arch/x86/kvm/x86.c
@@ -10094,7 +10094,7 @@ static int vcpu_enter_guest(struct kvm_vcpu *vcpu)
local_irq_enable();
++vcpu->stat.exits;
local_irq_disable();
- kvm_after_interrupt(vcpu);
+ kvm_after_interrupt();
/*
* Wait until after servicing IRQs to account guest time so that any
diff --git a/arch/x86/kvm/x86.h b/arch/x86/kvm/x86.h
index 1ebd5a7594da..651aa7ed5200 100644
--- a/arch/x86/kvm/x86.h
+++ b/arch/x86/kvm/x86.h
@@ -399,7 +399,7 @@ static inline void kvm_before_interrupt(struct kvm_vcpu *vcpu)
__this_cpu_write(current_vcpu, vcpu);
}
-static inline void kvm_after_interrupt(struct kvm_vcpu *vcpu)
+static inline void kvm_after_interrupt(void)
{
__this_cpu_write(current_vcpu, NULL);
}
--
2.33.1
Powered by blists - more mailing lists