aboutsummaryrefslogtreecommitdiff
path: root/hw
diff options
context:
space:
mode:
authorKnut Omang <knut.omang@oracle.com>2014-09-02 13:00:04 +0200
committerMichael S. Tsirkin <mst@redhat.com>2014-09-02 17:28:26 +0300
commitd7efb7e08e5edaac23b0dc824f72c3f353447c39 (patch)
treeb623b038d7cddd9546847b4f071007e8c61c31a7 /hw
parent0187c7989a5cedd4f88bba76839cc9c44fb3fc81 (diff)
downloadqemu-d7efb7e08e5edaac23b0dc824f72c3f353447c39.zip
qemu-d7efb7e08e5edaac23b0dc824f72c3f353447c39.tar.gz
qemu-d7efb7e08e5edaac23b0dc824f72c3f353447c39.tar.bz2
pci: avoid losing config updates to MSI/MSIX cap regs
Since commit 95d658002401e2e47a5404298ebe9508846e8a39 msi: Invoke msi/msix_write_config from PCI core msix config writes are lost, the value written is always 0. Fix pci_default_write_config to avoid this. Cc: qemu-stable@nongnu.org Signed-off-by: Knut Omang <knut.omang@oracle.com> Reviewed-by: Michael S. Tsirkin <mst@redhat.com> Signed-off-by: Michael S. Tsirkin <mst@redhat.com>
Diffstat (limited to 'hw')
-rw-r--r--hw/pci/pci.c7
1 files changed, 4 insertions, 3 deletions
diff --git a/hw/pci/pci.c b/hw/pci/pci.c
index daeaeac..d1e9a2a 100644
--- a/hw/pci/pci.c
+++ b/hw/pci/pci.c
@@ -1146,9 +1146,10 @@ uint32_t pci_default_read_config(PCIDevice *d,
return le32_to_cpu(val);
}
-void pci_default_write_config(PCIDevice *d, uint32_t addr, uint32_t val, int l)
+void pci_default_write_config(PCIDevice *d, uint32_t addr, uint32_t val_in, int l)
{
int i, was_irq_disabled = pci_irq_disabled(d);
+ uint32_t val = val_in;
for (i = 0; i < l; val >>= 8, ++i) {
uint8_t wmask = d->wmask[addr + i];
@@ -1170,8 +1171,8 @@ void pci_default_write_config(PCIDevice *d, uint32_t addr, uint32_t val, int l)
& PCI_COMMAND_MASTER);
}
- msi_write_config(d, addr, val, l);
- msix_write_config(d, addr, val, l);
+ msi_write_config(d, addr, val_in, l);
+ msix_write_config(d, addr, val_in, l);
}
/***********************************************************/