* [PATCH x86/mm] kvm IOPL_MASK cleanup
@ 2007-12-18 21:46 Roland McGrath
2007-12-18 21:57 ` Ingo Molnar
0 siblings, 1 reply; 2+ messages in thread
From: Roland McGrath @ 2007-12-18 21:46 UTC (permalink / raw)
To: Ingo Molnar, Thomas Gleixner
Cc: Andrew Morton, Glauber de Oliveira Costa, linux-kernel
IOPL_MASK went away and kvm/vmx.c doesn't compile.
Signed-off-by: Roland McGrath <roland@redhat.com>
---
diff --git a/drivers/kvm/vmx.c b/drivers/kvm/vmx.c
index bb56ae3..0000000 100644
--- a/drivers/kvm/vmx.c
+++ b/drivers/kvm/vmx.c
@@ -524,7 +524,7 @@ static unsigned long vmx_get_rflags(stru
static void vmx_set_rflags(struct kvm_vcpu *vcpu, unsigned long rflags)
{
if (vcpu->rmode.active)
- rflags |= IOPL_MASK | X86_EFLAGS_VM;
+ rflags |= X86_EFLAGS_IOPL | X86_EFLAGS_VM;
vmcs_writel(GUEST_RFLAGS, rflags);
}
@@ -1050,7 +1050,7 @@ static void enter_pmode(struct kvm_vcpu
vmcs_write32(GUEST_TR_AR_BYTES, vcpu->rmode.tr.ar);
flags = vmcs_readl(GUEST_RFLAGS);
- flags &= ~(IOPL_MASK | X86_EFLAGS_VM);
+ flags &= ~(X86_EFLAGS_IOPL | X86_EFLAGS_VM);
flags |= (vcpu->rmode.save_iopl << IOPL_SHIFT);
vmcs_writel(GUEST_RFLAGS, flags);
@@ -1107,9 +1107,9 @@ static void enter_rmode(struct kvm_vcpu
vmcs_write32(GUEST_TR_AR_BYTES, 0x008b);
flags = vmcs_readl(GUEST_RFLAGS);
- vcpu->rmode.save_iopl = (flags & IOPL_MASK) >> IOPL_SHIFT;
+ vcpu->rmode.save_iopl = (flags & X86_EFLAGS_IOPL) >> IOPL_SHIFT;
- flags |= IOPL_MASK | X86_EFLAGS_VM;
+ flags |= X86_EFLAGS_IOPL | X86_EFLAGS_VM;
vmcs_writel(GUEST_RFLAGS, flags);
vmcs_writel(GUEST_CR4, vmcs_readl(GUEST_CR4) | X86_CR4_VME);
^ permalink raw reply related [flat|nested] 2+ messages in thread
* Re: [PATCH x86/mm] kvm IOPL_MASK cleanup
2007-12-18 21:46 [PATCH x86/mm] kvm IOPL_MASK cleanup Roland McGrath
@ 2007-12-18 21:57 ` Ingo Molnar
0 siblings, 0 replies; 2+ messages in thread
From: Ingo Molnar @ 2007-12-18 21:57 UTC (permalink / raw)
To: Roland McGrath
Cc: Thomas Gleixner, Andrew Morton, Glauber de Oliveira Costa,
linux-kernel
* Roland McGrath <roland@redhat.com> wrote:
> IOPL_MASK went away and kvm/vmx.c doesn't compile.
thanks, applied.
Ingo
^ permalink raw reply [flat|nested] 2+ messages in thread
end of thread, other threads:[~2007-12-18 21:57 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2007-12-18 21:46 [PATCH x86/mm] kvm IOPL_MASK cleanup Roland McGrath
2007-12-18 21:57 ` Ingo Molnar
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox