diff options
| author | Anthony Liguori | 2012-09-10 19:48:43 +0200 |
|---|---|---|
| committer | Anthony Liguori | 2012-09-10 19:48:43 +0200 |
| commit | 14df77a609e39403c3ec814bae63bec0fb4d24d2 (patch) | |
| tree | faabedbfdaa0d8b467368f2be07d7d4eb929c247 /hw/pcie_aer.c | |
| parent | socket: don't attempt to reconnect a TCP socket in server mode (diff) | |
| parent | vhost: Pass device path to vhost_dev_init() (diff) | |
| download | qemu-14df77a609e39403c3ec814bae63bec0fb4d24d2.tar.gz qemu-14df77a609e39403c3ec814bae63bec0fb4d24d2.tar.xz qemu-14df77a609e39403c3ec814bae63bec0fb4d24d2.zip | |
Merge remote-tracking branch 'mst/tags/for_anthony' into staging
* mst/tags/for_anthony:
vhost: Pass device path to vhost_dev_init()
monitor: Rename+move net_handle_fd_param -> monitor_handle_fd_param
pcie_aer: clear cmask for Advanced Error Interrupt Message Number
pcie: drop version_id field for live migration
qemu: add .exrc
Diffstat (limited to 'hw/pcie_aer.c')
| -rw-r--r-- | hw/pcie_aer.c | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/hw/pcie_aer.c b/hw/pcie_aer.c index 3b6981c7b7..b04c164e22 100644 --- a/hw/pcie_aer.c +++ b/hw/pcie_aer.c @@ -738,6 +738,11 @@ void pcie_aer_root_init(PCIDevice *dev) PCI_ERR_ROOT_CMD_EN_MASK); pci_set_long(dev->w1cmask + pos + PCI_ERR_ROOT_STATUS, PCI_ERR_ROOT_STATUS_REPORT_MASK); + /* PCI_ERR_ROOT_IRQ is RO but devices change it using a + * device-specific method. + */ + pci_set_long(dev->cmask + pos + PCI_ERR_ROOT_STATUS, + ~PCI_ERR_ROOT_IRQ); } void pcie_aer_root_reset(PCIDevice *dev) |