diff options
| author | Sheng Yang <sheng@linux.intel.com> | 2008-11-24 14:32:52 +0800 |
|---|---|---|
| committer | Avi Kivity <avi@redhat.com> | 2008-12-31 16:55:01 +0200 |
| commit | fbac7818d8fba7e1df9f4b209777f3b67b953dd3 (patch) | |
| tree | 1af22733214c4b2f48fda501aaf5b941f448552a /virt/kvm | |
| parent | 4f906c19ae29397409bedabf7bbe5cb42ad90332 (diff) | |
| download | linux-stable-fbac7818d8fba7e1df9f4b209777f3b67b953dd3.tar.gz linux-stable-fbac7818d8fba7e1df9f4b209777f3b67b953dd3.tar.bz2 linux-stable-fbac7818d8fba7e1df9f4b209777f3b67b953dd3.zip | |
KVM: Clean up assigned_device_update_irq
Signed-off-by: Sheng Yang <sheng@linux.intel.com>
Signed-off-by: Avi Kivity <avi@redhat.com>
Diffstat (limited to 'virt/kvm')
| -rw-r--r-- | 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 638de47e167d..2089f8b68a16 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 |