Message ID | 6c238c97a87970991cff893d0b103c7026888f6e.1311272078.git.jan.kiszka@siemens.com (mailing list archive) |
---|---|
State | New, archived |
Headers | show |
diff --git a/hw/device-assignment.c b/hw/device-assignment.c index 36ad6b0..36c0f5f 100644 --- a/hw/device-assignment.c +++ b/hw/device-assignment.c @@ -992,9 +992,10 @@ static int assign_irq(AssignedDevice *dev) if (dev->irq_requested_type) { assigned_irq_data.flags = dev->irq_requested_type; r = kvm_deassign_irq(kvm_state, &assigned_irq_data); - /* -ENXIO means no assigned irq */ - if (r && r != -ENXIO) + if (r) { perror("assign_irq: deassign"); + } + dev->irq_requested_type = 0; } assigned_irq_data.flags = KVM_DEV_IRQ_GUEST_INTX;
Always clear AssignedDevice::irq_requested_type after calling kvm_deassign_irq. Moreover, drop the obviously incorrect exclusion when reporting related errors - if irq_requested_type is non-zero, deassign must not fail. Signed-off-by: Jan Kiszka <jan.kiszka@siemens.com> --- hw/device-assignment.c | 5 +++-- 1 files changed, 3 insertions(+), 2 deletions(-)