From: Nadav Amit <namit@cs.technion.ac.il>
Date: Wed, 10 Dec 2014 09:19:03 +0000 (+0200)
Subject: KVM: x86: Do not push eflags.vm on pushf
X-Git-Url: http://drtracing.org/?a=commitdiff_plain;h=bc397a6c914c75d8ae21dad23eba9ae82e34dad3;p=deliverable%2Flinux.git

KVM: x86: Do not push eflags.vm on pushf

The pushf instruction does not push eflags.VM, so emulation should not do so as
well.  Although eflags.RF should not be pushed as well, it is already cleared
by the time pushf is executed.

Signed-off-by: Nadav Amit <namit@cs.technion.ac.il>
Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
---

diff --git a/arch/x86/kvm/emulate.c b/arch/x86/kvm/emulate.c
index b4f4201c32c9..c1e71873e0c7 100644
--- a/arch/x86/kvm/emulate.c
+++ b/arch/x86/kvm/emulate.c
@@ -1861,7 +1861,7 @@ static int em_pusha(struct x86_emulate_ctxt *ctxt)
 
 static int em_pushf(struct x86_emulate_ctxt *ctxt)
 {
-	ctxt->src.val =  (unsigned long)ctxt->eflags;
+	ctxt->src.val = (unsigned long)ctxt->eflags & ~EFLG_VM;
 	return em_push(ctxt);
 }