From: Sheng Yang <sheng@linux.intel.com>
To: Avi Kivity <avi@redhat.com>
Cc: kvm@vger.kernel.org, Sheng Yang <sheng@linux.intel.com>
Subject: [PATCH 04/10] KVM: Clean up assigned_device_update_irq
Date: Thu, 30 Oct 2008 16:20:12 +0800 [thread overview]
Message-ID: <1225354818-16963-5-git-send-email-sheng@linux.intel.com> (raw)
In-Reply-To: <1225354818-16963-1-git-send-email-sheng@linux.intel.com>
Signed-off-by: Sheng Yang <sheng@linux.intel.com>
---
virt/kvm/kvm_main.c | 10 ++++------
1 files changed, 4 insertions(+), 6 deletions(-)
diff --git a/virt/kvm/kvm_main.c b/virt/kvm/kvm_main.c
index 6ca04ce..ddfd7ac 100644
--- a/virt/kvm/kvm_main.c
+++ b/virt/kvm/kvm_main.c
@@ -180,11 +180,11 @@ static int assigned_device_update_intx(struct kvm *kvm,
struct kvm_assigned_dev_kernel *adev,
struct kvm_assigned_irq *airq)
{
- if (adev->irq_requested_type & KVM_ASSIGNED_DEV_GUEST_INTX) {
- adev->guest_irq = airq->guest_irq;
- adev->ack_notifier.gsi = airq->guest_irq;
+ adev->guest_irq = airq->guest_irq;
+ adev->ack_notifier.gsi = airq->guest_irq;
+
+ if (adev->irq_requested_type & KVM_ASSIGNED_DEV_HOST_INTX)
return 0;
- }
if (irqchip_in_kernel(kvm)) {
if (!capable(CAP_SYS_RAWIO))
@@ -194,8 +194,6 @@ static int assigned_device_update_intx(struct kvm *kvm,
adev->host_irq = airq->host_irq;
else
adev->host_irq = adev->dev->irq;
- adev->guest_irq = airq->guest_irq;
- adev->ack_notifier.gsi = airq->guest_irq;
/* Even though this is PCI, we don't want to use shared
* interrupts. Sharing host devices with guest-assigned devices
--
1.5.4.5
next prev parent reply other threads:[~2008-10-30 8:22 UTC|newest]
Thread overview: 13+ messages / expand[flat|nested] mbox.gz Atom feed top
2008-10-30 8:20 [RFC][PATCH 0/10][v3] Enable MSI for KVM assigned device Sheng Yang
2008-10-30 8:20 ` [PATCH 01/10] KVM: Move ack notifier register and IRQ sourcd ID request Sheng Yang
2008-10-30 8:20 ` [PATCH 02/10] KVM: Separate update irq to a single function Sheng Yang
2008-10-30 8:20 ` [PATCH 03/10] KVM: Replace irq_requested with more generic irq_requested_type Sheng Yang
2008-10-30 8:20 ` Sheng Yang [this message]
2008-10-30 8:20 ` [PATCH 05/10] KVM: Add fields for MSI device assignment Sheng Yang
2008-10-30 8:20 ` [PATCH 06/10] KVM: Export ioapic_get_delivery_bitmask Sheng Yang
2008-10-30 8:20 ` [PATCH 07/10] x86: Add MSI delivery mode mask Sheng Yang
2008-10-30 8:20 ` [PATCH 08/10] KVM: Add assigned_device_msi_dispatch() Sheng Yang
2008-10-30 8:56 ` Sheng Yang
2008-10-30 8:20 ` [PATCH 09/10] KVM: Enable MSI for device assignment Sheng Yang
2008-10-30 8:20 ` [PATCH 10/10] KVM: MSI to INTx translate Sheng Yang
-- strict thread matches above, loose matches on Subject: below --
2008-10-31 4:50 [PATCH 0/10][v4] Enable MSI for KVM assigned device kernel part Sheng Yang
2008-10-31 4:50 ` [PATCH 04/10] KVM: Clean up assigned_device_update_irq Sheng Yang
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=1225354818-16963-5-git-send-email-sheng@linux.intel.com \
--to=sheng@linux.intel.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 a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox