Code Review
/
kvmfornfv.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
review
|
tree
raw
|
inline
| side by side
kvm: vmx: rename vmx_pre/post_block to pi_pre/post_block
[kvmfornfv.git]
/
kernel
/
arch
/
x86
/
kvm
/
vmx.c
diff --git
a/kernel/arch/x86/kvm/vmx.c
b/kernel/arch/x86/kvm/vmx.c
index
0958fa2
..
0732111
100644
(file)
--- a/
kernel/arch/x86/kvm/vmx.c
+++ b/
kernel/arch/x86/kvm/vmx.c
@@
-10576,7
+10576,7
@@
static void vmx_enable_log_dirty_pt_masked(struct kvm *kvm,
* this case, return 1, otherwise, return 0.
*
*/
* 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;
{
unsigned long flags;
unsigned int dest;
@@
-10642,7
+10642,15
@@
static int vmx_pre_block(struct kvm_vcpu *vcpu)
return 0;
}
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;
{
struct pi_desc *pi_desc = vcpu_to_pi_desc(vcpu);
struct pi_desc old, new;
@@
-10683,6
+10691,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
*
/*
* vmx_update_pi_irte - set IRTE for Posted-Interrupts
*