diff options
| author | Anthony Liguori <aliguori@us.ibm.com> | 2012-06-18 10:18:44 -0500 |
|---|---|---|
| committer | Anthony Liguori <aliguori@us.ibm.com> | 2012-06-18 10:18:44 -0500 |
| commit | df6606f4556a752d30a4eab26c626b6c34717ea8 (patch) | |
| tree | 095df894fd2f1e40f6a8a5a6393e10a953d8054d /hw/pci.c | |
| parent | 49023ff78cf1efeb861b475c40dd04262efe61d3 (diff) | |
| parent | 80aa796bf38b7ef21daa42673b4711510c450d8a (diff) | |
| download | focaccia-qemu-df6606f4556a752d30a4eab26c626b6c34717ea8.tar.gz focaccia-qemu-df6606f4556a752d30a4eab26c626b6c34717ea8.zip | |
Merge remote-tracking branch 'mst/tags/for_anthony' into staging
* mst/tags/for_anthony: pci_bridge_dev: fix error path in pci_bridge_dev_initfn() qdev: release parent properties on dc->init failure msi: Use msi/msix_present more consistently msi: Invoke msi/msix_write_config from PCI core msi: Guard msi/msix_write_config with msi_present msi: Invoke msi/msix_reset from PCI core msi: Guard msi_reset with msi_present ahci: Clean up reset functions intel-hda: Fix reset of MSI function ahci: Fix reset of MSI function rtl8139: honor RxOverflow flag in can_receive method shpc: unparent device before free
Diffstat (limited to 'hw/pci.c')
| -rw-r--r-- | hw/pci.c | 8 |
1 files changed, 8 insertions, 0 deletions
diff --git a/hw/pci.c b/hw/pci.c index 127b7aca73..9daa0bfb20 100644 --- a/hw/pci.c +++ b/hw/pci.c @@ -31,6 +31,8 @@ #include "loader.h" #include "range.h" #include "qmp-commands.h" +#include "msi.h" +#include "msix.h" //#define DEBUG_PCI #ifdef DEBUG_PCI @@ -188,6 +190,9 @@ void pci_device_reset(PCIDevice *dev) } } pci_update_mappings(dev); + + msi_reset(dev); + msix_reset(dev); } /* @@ -1037,6 +1042,9 @@ void pci_default_write_config(PCIDevice *d, uint32_t addr, uint32_t val, int l) if (range_covers_byte(addr, l, PCI_COMMAND)) pci_update_irq_disabled(d, was_irq_disabled); + + msi_write_config(d, addr, val, l); + msix_write_config(d, addr, val, l); } /***********************************************************/ |