device-assignment: fix failure to exit on shared IRQ
PATCH 1/1 device-assignment: fix failure to exit on shared IRQ
Since c1699988, piix config space isn't programmed until the first system reset. This means that when we call assign_irq() from assigned_initfn(), we're going to get back an irq of 0x0, which unfortunately matches our initialization value, so we don't bother to call kvm_assign_irq(). Switch to a -1 initializer so we can test whether kvm_assign_irq() is going to succeed and allow the process to exit if it doesn't. The guest irq will get reset to a more appropriate value on system reset anyway.
---
hw/device-assignment.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-)
hw/device-assignment.c +1 -1
@@ -1346,7 +1346,7 @@ static int assigned_initfn(struct PCIDevice *pci_dev) e_intx = dev->dev.config[0x3d ] -1 ; dev->intpin = e_intx; dev->run =0 ; - dev->girq =0 ; + dev->girq =-1 ; dev->h_segnr = dev->host.seg; dev->h_busnr = dev->host.bus; dev->h_devfn =PCI_DEVFN (dev->host.dev, dev->host.func);
Quoted 10 lines · * Alex Williamson ([email protected]) wrote:
Since
c1699988, piix config space isn't programmed until the first system reset. This means that when we callassign_irq()fromassigned_initfn(), we're going to get back an irq of0x0, which unfortunately matches our initialization value, so we don't bother to callkvm_assign_irq(). Switch to a -1 initializer so we can test whetherkvm_assign_irq()is going to succeed and allow the process to exit if it doesn't. The guest irq will get reset to a more appropriate value on system reset anyway.Signed-off-by Alex Williamson <[email protected]>
Marcelo Tosatti
AppliedQuoted 10 lines · Alex Williamson
Since
c1699988, piix config space isn't programmed until the first system reset. This means that when we callassign_irq()fromassigned_initfn(), we're going to get back an irq of0x0, which unfortunately matches our initialization value, so we don't bother to callkvm_assign_irq(). Switch to a -1 initializer so we can test whetherkvm_assign_irq()is going to succeed and allow the process to exit if it doesn't. The guest irq will get reset to a more appropriate value on system reset anyway.Signed-off-by Alex Williamson <[email protected]>
Applied, thanks.