All of lore.kernel.org
 help / color / mirror / Atom feed
From: Gleb Natapov <gleb@redhat.com>
To: avi@redhat.com
Cc: kvm@vger.kernel.org, Gleb Natapov <gleb@redhat.com>
Subject: [PATCH 09/10] Disable CR8 intercept if tpr patching is active.
Date: Mon, 11 May 2009 13:35:54 +0300	[thread overview]
Message-ID: <1242038155-8759-9-git-send-email-gleb@redhat.com> (raw)
In-Reply-To: <1242038155-8759-1-git-send-email-gleb@redhat.com>


Signed-off-by: Gleb Natapov <gleb@redhat.com>
---
 arch/x86/kvm/x86.c |   11 ++++++-----
 1 files changed, 6 insertions(+), 5 deletions(-)

diff --git a/arch/x86/kvm/x86.c b/arch/x86/kvm/x86.c
index 2729c4b..04236b2 100644
--- a/arch/x86/kvm/x86.c
+++ b/arch/x86/kvm/x86.c
@@ -3130,7 +3130,10 @@ static void update_cr8_intercept(struct kvm_vcpu *vcpu)
 	if (!kvm_x86_ops->update_cr8_intercept)
 		return;
 
-	max_irr = kvm_lapic_find_highest_irr(vcpu);
+	if (!vcpu->arch.apic->vapic_addr)
+		max_irr = kvm_lapic_find_highest_irr(vcpu);
+	else
+		max_irr = -1;
 
 	if (max_irr != -1)
 		max_irr >>= 4;
@@ -3237,10 +3240,8 @@ static int vcpu_enter_guest(struct kvm_vcpu *vcpu, struct kvm_run *kvm_run)
 		kvm_x86_ops->enable_irq_window(vcpu);
 
 	if (kvm_lapic_enabled(vcpu)) {
-		if (!vcpu->arch.apic->vapic_addr)
-			update_cr8_intercept(vcpu);
-		else
-			kvm_lapic_sync_to_vapic(vcpu);
+		update_cr8_intercept(vcpu);
+		kvm_lapic_sync_to_vapic(vcpu);
 	}
 
 	up_read(&vcpu->kvm->slots_lock);
-- 
1.6.2.1


  parent reply	other threads:[~2009-05-11 10:35 UTC|newest]

Thread overview: 11+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2009-05-11 10:35 [PATCH 01/10] Unprotect a page if #PF happens during NMI injection Gleb Natapov
2009-05-11 10:35 ` [PATCH 02/10] Do not allow interrupt injection from userspace if there is a pending event Gleb Natapov
2009-05-11 10:35 ` [PATCH 03/10] Remove irq_pending bitmap Gleb Natapov
2009-05-11 10:35 ` [PATCH 04/10] [SVM] skip_emulated_instruction() decode an instruction if size is not known Gleb Natapov
2009-05-11 10:35 ` [PATCH 05/10] [VMX] Do not re-execute INTn instruction Gleb Natapov
2009-05-11 10:35 ` [PATCH 06/10] IRQ/NMI window should always be requested Gleb Natapov
2009-05-11 10:35 ` [PATCH 07/10] [SVM] inject NMI after IRET from a previous NMI, not before Gleb Natapov
2009-05-11 10:35 ` [PATCH 08/10] Do not migrate pending software interrupts Gleb Natapov
2009-05-11 10:35 ` Gleb Natapov [this message]
2009-05-11 10:35 ` [PATCH 10/10] Move "exit due to NMI" handling into vmx_complete_interrupts() Gleb Natapov
2009-05-13 12:07 ` [PATCH 01/10] Unprotect a page if #PF happens during NMI injection Avi Kivity

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=1242038155-8759-9-git-send-email-gleb@redhat.com \
    --to=gleb@redhat.com \
    --cc=avi@redhat.com \
    --cc=kvm@vger.kernel.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body. 
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.