On Fri, Dec 03, 2010 at 12:54:33AM +0200, Michael S. Tsirkin wrote: > diff --git a/hw/pcie_aer.c b/hw/pcie_aer.c > index 235ac53..18bbd5a 100644 > --- a/hw/pcie_aer.c > +++ b/hw/pcie_aer.c > @@ -339,10 +339,10 @@ static bool pcie_aer_msg_root_port(PCIDevice *dev, > const PCIEAERMsg *msg) > > if (root_cmd & msg->severity) { > /* 6.2.4.1.2 Interrupt Generation */ > - if (pci_msi_enabled(dev)) { > - if (msi_trigger) { > - pci_msi_notify(dev, pcie_aer_root_get_vector(dev)); > - } > + if (msix_enabled(dev)) { > + msix_notify(dev, pcie_aer_root_get_vector(dev)); > + } else if (msi_enabled(dev)) { > + msi_notify(dev, pcie_aer_root_get_vector(dev)); > } else { > qemu_set_irq(dev->irq[dev->exp.aer_intx], 1); > }
This changes the logic which is fixed by 3/6. It breaks bisecability. Except this, the eventual result seems correct. -- yamahata