diff options
| author | Anthony Liguori <aliguori@us.ibm.com> | 2013-01-02 08:01:36 -0600 |
|---|---|---|
| committer | Anthony Liguori <aliguori@us.ibm.com> | 2013-01-02 08:01:36 -0600 |
| commit | 079944e695589364d19de31f27761c6bdea1c207 (patch) | |
| tree | 072caf3ebee747b1ff92ad8e0086ff4edbd7220e /hw/pci/pcie.c | |
| parent | a97ff30e934c4d673122cf709e8e87f0effbe2f7 (diff) | |
| parent | 89d62be9f4fb538db7f919a2be7df2544ffc02c5 (diff) | |
| download | focaccia-qemu-079944e695589364d19de31f27761c6bdea1c207.tar.gz focaccia-qemu-079944e695589364d19de31f27761c6bdea1c207.zip | |
Merge remote-tracking branch 'mst/tags/for_anthony' into staging
pci,virtio This optimizes MSIX handling in virtio-pci. Also included is pci express capability bugfix. Signed-off-by: Michael S. Tsirkin <mst@redhat.com> Signed-off-by: Anthony Liguori <aliguori@us.ibm.com> * mst/tags/for_anthony: virtio-pci: don't poll masked vectors msix: expose access to masked/pending state msi: add API to get notified about pending bit poll pcie: Fix bug in pcie_ext_cap_set_next virtio: make bindings typesafe
Diffstat (limited to 'hw/pci/pcie.c')
| -rw-r--r-- | hw/pci/pcie.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/hw/pci/pcie.c b/hw/pci/pcie.c index 6c916d15ec..485c94c1b2 100644 --- a/hw/pci/pcie.c +++ b/hw/pci/pcie.c @@ -494,7 +494,7 @@ uint16_t pcie_find_capability(PCIDevice *dev, uint16_t cap_id) static void pcie_ext_cap_set_next(PCIDevice *dev, uint16_t pos, uint16_t next) { - uint16_t header = pci_get_long(dev->config + pos); + uint32_t header = pci_get_long(dev->config + pos); assert(!(next & (PCI_EXT_CAP_ALIGN - 1))); header = (header & ~PCI_EXT_CAP_NEXT_MASK) | ((next << PCI_EXT_CAP_NEXT_SHIFT) & PCI_EXT_CAP_NEXT_MASK); |