[SRU][Xenial][PATCH v3 1/4] kvm: vmx: rename vmx_pre/post_block to pi_pre/post_block
Ioanna Alifieraki
ioanna-maria.alifieraki at canonical.com
Mon Jan 18 23:22:05 UTC 2021
From: Yunhong Jiang <yunhong.jiang at gmail.com>
BugLink: https://bugs.launchpad.net/bugs/1908428
Prepare to switch from preemption timer to hrtimer in the
vmx_pre/post_block. Current functions are only for posted interrupt,
rename them accordingly.
Signed-off-by: Yunhong Jiang <yunhong.jiang at intel.com>
Signed-off-by: Paolo Bonzini <pbonzini at redhat.com>
(cherry picked from commit bc22512bb24c480fae8ae96b233378ef96007590)
Signed-off-by: Ioanna Alifieraki <ioanna-maria.alifieraki at canonical.com>
---
arch/x86/kvm/vmx.c | 17 +++++++++++++++--
1 file changed, 15 insertions(+), 2 deletions(-)
diff --git a/arch/x86/kvm/vmx.c b/arch/x86/kvm/vmx.c
index 46d1293..d73ad4b 100644
--- a/arch/x86/kvm/vmx.c
+++ b/arch/x86/kvm/vmx.c
@@ -11158,7 +11158,7 @@ static void vmx_enable_log_dirty_pt_masked(struct kvm *kvm,
* this case, return 1, otherwise, return 0.
*
*/
-static int vmx_pre_block(struct kvm_vcpu *vcpu)
+static int pi_pre_block(struct kvm_vcpu *vcpu)
{
unsigned long flags;
unsigned int dest;
@@ -11224,7 +11224,15 @@ static int vmx_pre_block(struct kvm_vcpu *vcpu)
return 0;
}
-static void vmx_post_block(struct kvm_vcpu *vcpu)
+static int vmx_pre_block(struct kvm_vcpu *vcpu)
+{
+ if (pi_pre_block(vcpu))
+ return 1;
+
+ return 0;
+}
+
+static void pi_post_block(struct kvm_vcpu *vcpu)
{
struct pi_desc *pi_desc = vcpu_to_pi_desc(vcpu);
struct pi_desc old, new;
@@ -11265,6 +11273,11 @@ static void vmx_post_block(struct kvm_vcpu *vcpu)
}
}
+static void vmx_post_block(struct kvm_vcpu *vcpu)
+{
+ pi_post_block(vcpu);
+}
+
/*
* vmx_update_pi_irte - set IRTE for Posted-Interrupts
*
--
1.9.1
More information about the kernel-team
mailing list