From patchwork Tue Feb 23 16:47:59 2010
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: 7bit
X-Patchwork-Submitter: Jan Kiszka <jan.kiszka@siemens.com>
X-Patchwork-Id: 81491
Received: from vger.kernel.org (vger.kernel.org [209.132.180.67])
	by demeter.kernel.org (8.14.3/8.14.3) with ESMTP id o1NGmWYD016135
	for <patchwork-kvm@patchwork.kernel.org>;
	Tue, 23 Feb 2010 16:48:32 GMT
Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand
	id S1753470Ab0BWQs0 (ORCPT
	<rfc822;patchwork-kvm@patchwork.kernel.org>);
	Tue, 23 Feb 2010 11:48:26 -0500
Received: from thoth.sbs.de ([192.35.17.2]:17426 "EHLO thoth.sbs.de"
	rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP
	id S1753418Ab0BWQsT (ORCPT <rfc822;kvm@vger.kernel.org>);
	Tue, 23 Feb 2010 11:48:19 -0500
Received: from mail1.siemens.de (localhost [127.0.0.1])
	by thoth.sbs.de (8.12.11.20060308/8.12.11) with ESMTP id
	o1NGm1oM009253; Tue, 23 Feb 2010 17:48:01 +0100
Received: from localhost.localdomain (mchn012c.mchp.siemens.de
	[139.25.109.167] (may be forged))
	by mail1.siemens.de (8.12.11.20060308/8.12.11) with ESMTP id
	o1NGm0Pa003583; Tue, 23 Feb 2010 17:48:01 +0100
From: Jan Kiszka <jan.kiszka@siemens.com>
To: Avi Kivity <avi@redhat.com>, Marcelo Tosatti <mtosatti@redhat.com>
Cc: kvm <kvm@vger.kernel.org>, Gleb Natapov <gleb@redhat.com>
Subject: [PATCH v2 7/7] KVM: x86: Preserve injected TF across emulation
Date: Tue, 23 Feb 2010 17:47:59 +0100
Message-Id: 
 <bd416c9cf138c91619ac43fbd07065d4460d745b.1266943665.git.jan.kiszka@siemens.com>
X-Mailer: git-send-email 1.6.0.2
In-Reply-To: <cover.1266943665.git.jan.kiszka@siemens.com>
References: <cover.1266943665.git.jan.kiszka@siemens.com>
In-Reply-To: <cover.1266943665.git.jan.kiszka@siemens.com>
References: <cover.1266943665.git.jan.kiszka@siemens.com>
Sender: kvm-owner@vger.kernel.org
Precedence: bulk
List-ID: <kvm.vger.kernel.org>
X-Mailing-List: kvm@vger.kernel.org
X-Greylist: IP, sender and recipient auto-whitelisted, not delayed by
	milter-greylist-4.2.3 (demeter.kernel.org [140.211.167.41]);
	Tue, 23 Feb 2010 16:48:32 +0000 (UTC)


diff --git a/arch/x86/kvm/x86.c b/arch/x86/kvm/x86.c
index 8181595..7b436c8 100644
--- a/arch/x86/kvm/x86.c
+++ b/arch/x86/kvm/x86.c
@@ -3468,7 +3468,7 @@ int emulate_instruction(struct kvm_vcpu *vcpu,
 		kvm_x86_ops->get_cs_db_l_bits(vcpu, &cs_db, &cs_l);
 
 		vcpu->arch.emulate_ctxt.vcpu = vcpu;
-		vcpu->arch.emulate_ctxt.eflags = kvm_get_rflags(vcpu);
+		vcpu->arch.emulate_ctxt.eflags = kvm_x86_ops->get_rflags(vcpu);
 		vcpu->arch.emulate_ctxt.mode =
 			(!is_protmode(vcpu)) ? X86EMUL_MODE_REAL :
 			(vcpu->arch.emulate_ctxt.eflags & X86_EFLAGS_VM)
@@ -3547,7 +3547,7 @@ int emulate_instruction(struct kvm_vcpu *vcpu,
 		return EMULATE_DO_MMIO;
 	}
 
-	kvm_set_rflags(vcpu, vcpu->arch.emulate_ctxt.eflags);
+	kvm_x86_ops->set_rflags(vcpu, vcpu->arch.emulate_ctxt.eflags);
 
 	if (vcpu->mmio_is_write) {
 		vcpu->mmio_needed = 0;