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 v2 08/16] Remove inject_pending_vectors() callback.
Date: Tue, 21 Apr 2009 17:45:03 +0300	[thread overview]
Message-ID: <1240325111-3725-9-git-send-email-gleb@redhat.com> (raw)
In-Reply-To: <1240325111-3725-1-git-send-email-gleb@redhat.com>

It is the same as inject_pending_irq() for VMX/SVM now.

Signed-off-by: Gleb Natapov <gleb@redhat.com>
---
 arch/x86/include/asm/kvm_host.h |    2 --
 arch/x86/kvm/svm.c              |    1 -
 arch/x86/kvm/vmx.c              |    1 -
 arch/x86/kvm/x86.c              |    4 +---
 4 files changed, 1 insertions(+), 7 deletions(-)

diff --git a/arch/x86/include/asm/kvm_host.h b/arch/x86/include/asm/kvm_host.h
index fc29e36..663dba8 100644
--- a/arch/x86/include/asm/kvm_host.h
+++ b/arch/x86/include/asm/kvm_host.h
@@ -520,8 +520,6 @@ struct kvm_x86_ops {
 	void (*queue_exception)(struct kvm_vcpu *vcpu, unsigned nr,
 				bool has_error_code, u32 error_code);
 	void (*inject_pending_irq)(struct kvm_vcpu *vcpu, struct kvm_run *run);
-	void (*inject_pending_vectors)(struct kvm_vcpu *vcpu,
-				       struct kvm_run *run);
 	int (*interrupt_allowed)(struct kvm_vcpu *vcpu);
 	int (*set_tss_addr)(struct kvm *kvm, unsigned int addr);
 	int (*get_tdp_level)(void);
diff --git a/arch/x86/kvm/svm.c b/arch/x86/kvm/svm.c
index d6bc56a..f8beddb 100644
--- a/arch/x86/kvm/svm.c
+++ b/arch/x86/kvm/svm.c
@@ -2643,7 +2643,6 @@ static struct kvm_x86_ops svm_x86_ops = {
 	.set_irq = svm_set_irq,
 	.queue_exception = svm_queue_exception,
 	.inject_pending_irq = svm_intr_assist,
-	.inject_pending_vectors = svm_intr_assist,
 	.interrupt_allowed = svm_interrupt_allowed,
 
 	.set_tss_addr = svm_set_tss_addr,
diff --git a/arch/x86/kvm/vmx.c b/arch/x86/kvm/vmx.c
index 3186fcf..9162b4c 100644
--- a/arch/x86/kvm/vmx.c
+++ b/arch/x86/kvm/vmx.c
@@ -3693,7 +3693,6 @@ static struct kvm_x86_ops vmx_x86_ops = {
 	.set_irq = vmx_inject_irq,
 	.queue_exception = vmx_queue_exception,
 	.inject_pending_irq = vmx_intr_assist,
-	.inject_pending_vectors = vmx_intr_assist,
 	.interrupt_allowed = vmx_interrupt_allowed,
 	.set_tss_addr = vmx_set_tss_addr,
 	.get_tdp_level = get_ept_level,
diff --git a/arch/x86/kvm/x86.c b/arch/x86/kvm/x86.c
index a50c8a3..d94a152 100644
--- a/arch/x86/kvm/x86.c
+++ b/arch/x86/kvm/x86.c
@@ -3161,10 +3161,8 @@ static int vcpu_enter_guest(struct kvm_vcpu *vcpu, struct kvm_run *kvm_run)
 
 	if (vcpu->arch.exception.pending)
 		__queue_exception(vcpu);
-	else if (irqchip_in_kernel(vcpu->kvm))
-		kvm_x86_ops->inject_pending_irq(vcpu, kvm_run);
 	else
-		kvm_x86_ops->inject_pending_vectors(vcpu, kvm_run);
+		kvm_x86_ops->inject_pending_irq(vcpu, kvm_run);
 
 	kvm_lapic_sync_to_vapic(vcpu);
 
-- 
1.5.6.5


  parent reply	other threads:[~2009-04-21 14:45 UTC|newest]

Thread overview: 26+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2009-04-21 14:44 [PATCH v2 00/16] interrupt injection rework Gleb Natapov
2009-04-21 14:44 ` [PATCH v2 01/16] Make kvm_cpu_(has|get)_interrupt() work for userspace irqchip too Gleb Natapov
2009-04-21 14:44 ` [PATCH v2 02/16] Consolidate userspace and kernel interrupt injection for VMX Gleb Natapov
2009-04-21 14:44 ` [PATCH v2 03/16] Cleanup vmx_intr_assist() Gleb Natapov
2009-04-21 14:44 ` [PATCH v2 04/16] Use kvm_arch_interrupt_allowed() instead of checking interrupt_window_open directly Gleb Natapov
2009-04-21 14:45 ` [PATCH v2 05/16] Coalesce userspace/kernel irqchip interrupt injection logic Gleb Natapov
2009-04-23 14:14   ` Gleb Natapov
2009-04-21 14:45 ` [PATCH v2 06/16] Use EVENTINJ to inject interrupts Gleb Natapov
2009-04-21 14:45 ` [PATCH v2 07/16] Remove exception_injected() callback Gleb Natapov
2009-04-21 14:45 ` Gleb Natapov [this message]
2009-04-21 14:45 ` [PATCH v2 09/16] kvm_push_irq() no longer used Gleb Natapov
2009-04-21 14:45 ` [PATCH v2 10/16] sync_lapic_to_cr8() should always sync cr8 to V_TPR Gleb Natapov
2009-04-21 14:45 ` [PATCH v2 11/16] Do not report TPR write to userspace if new value bigger or equal to a previous one Gleb Natapov
2009-04-21 14:45 ` [PATCH v2 12/16] Get rid of arch.interrupt_window_open & arch.nmi_window_open Gleb Natapov
2009-04-21 14:45 ` [PATCH v2 13/16] Add NMI injection support to SVM Gleb Natapov
2009-04-21 14:45 ` [PATCH v2 14/16] Move interrupt injection logic to x86.c Gleb Natapov
2009-04-21 14:45 ` [PATCH v2 15/16] Fix userspace IRQ chip migration Gleb Natapov
2009-04-21 14:45 ` [PATCH v2 16/16] Get rid of get_irq() callback Gleb Natapov
2009-04-27 11:19 ` [PATCH v2 00/16] interrupt injection rework Avi Kivity
2009-04-29  9:30   ` Jan Kiszka
2009-04-29 10:22     ` Gleb Natapov
2009-04-29 10:33       ` Jan Kiszka
2009-04-29 10:35         ` Gleb Natapov
2009-04-29 10:46           ` Jan Kiszka
2009-04-29 10:40     ` Avi Kivity
2009-04-29 10:47       ` Jan Kiszka

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=1240325111-3725-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.