aboutsummaryrefslogtreecommitdiffstats
path: root/virt/kvm
diff options
context:
space:
mode:
authorSheng Yang <sheng@linux.intel.com>2008-11-24 01:32:52 -0500
committerAvi Kivity <avi@redhat.com>2008-12-31 09:55:01 -0500
commitfbac7818d8fba7e1df9f4b209777f3b67b953dd3 (patch)
tree1af22733214c4b2f48fda501aaf5b941f448552a /virt/kvm
parent4f906c19ae29397409bedabf7bbe5cb42ad90332 (diff)
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.c10
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,
180 struct kvm_assigned_dev_kernel *adev, 180 struct kvm_assigned_dev_kernel *adev,
181 struct kvm_assigned_irq *airq) 181 struct kvm_assigned_irq *airq)
182{ 182{
183 if (adev->irq_requested_type & KVM_ASSIGNED_DEV_GUEST_INTX) { 183 adev->guest_irq = airq->guest_irq;
184 adev->guest_irq = airq->guest_irq; 184 adev->ack_notifier.gsi = airq->guest_irq;
185 adev->ack_notifier.gsi = airq->guest_irq; 185
186 if (adev->irq_requested_type & KVM_ASSIGNED_DEV_HOST_INTX)
186 return 0; 187 return 0;
187 }
188 188
189 if (irqchip_in_kernel(kvm)) { 189 if (irqchip_in_kernel(kvm)) {
190 if (!capable(CAP_SYS_RAWIO)) 190 if (!capable(CAP_SYS_RAWIO))
@@ -194,8 +194,6 @@ static int assigned_device_update_intx(struct kvm *kvm,
194 adev->host_irq = airq->host_irq; 194 adev->host_irq = airq->host_irq;
195 else 195 else
196 adev->host_irq = adev->dev->irq; 196 adev->host_irq = adev->dev->irq;
197 adev->guest_irq = airq->guest_irq;
198 adev->ack_notifier.gsi = airq->guest_irq;
199 197
200 /* Even though this is PCI, we don't want to use shared 198 /* Even though this is PCI, we don't want to use shared
201 * interrupts. Sharing host devices with guest-assigned devices 199 * interrupts. Sharing host devices with guest-assigned devices