[PATCH] KVM: VMX: Use wrapper macro ~RMODE_GUEST_OWNED_EFLAGS_BITS directly

From: linmiaohe
Date: Wed Mar 04 2020 - 21:32:47 EST


From: Miaohe Lin <linmiaohe@xxxxxxxxxx>

(X86_EFLAGS_IOPL | X86_EFLAGS_VM) indicates the eflag bits that can not be
owned by realmode guest, i.e. ~RMODE_GUEST_OWNED_EFLAGS_BITS. Use wrapper
macro directly to make it clear and also improve readability.

Signed-off-by: Miaohe Lin <linmiaohe@xxxxxxxxxx>
---
arch/x86/kvm/vmx/vmx.c | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/arch/x86/kvm/vmx/vmx.c b/arch/x86/kvm/vmx/vmx.c
index 743b81642ce2..9571f8dea016 100644
--- a/arch/x86/kvm/vmx/vmx.c
+++ b/arch/x86/kvm/vmx/vmx.c
@@ -1466,7 +1466,7 @@ void vmx_set_rflags(struct kvm_vcpu *vcpu, unsigned long rflags)
vmx->rflags = rflags;
if (vmx->rmode.vm86_active) {
vmx->rmode.save_rflags = rflags;
- rflags |= X86_EFLAGS_IOPL | X86_EFLAGS_VM;
+ rflags |= ~RMODE_GUEST_OWNED_EFLAGS_BITS;
}
vmcs_writel(GUEST_RFLAGS, rflags);

@@ -2797,7 +2797,7 @@ static void enter_rmode(struct kvm_vcpu *vcpu)
flags = vmcs_readl(GUEST_RFLAGS);
vmx->rmode.save_rflags = flags;

- flags |= X86_EFLAGS_IOPL | X86_EFLAGS_VM;
+ flags |= ~RMODE_GUEST_OWNED_EFLAGS_BITS;

vmcs_writel(GUEST_RFLAGS, flags);
vmcs_writel(GUEST_CR4, vmcs_readl(GUEST_CR4) | X86_CR4_VME);
--
2.19.1