summary refs log tree commit diff stats
path: root/include/hw/pci/pci_ids.h
diff options
context:
space:
mode:
authorPeter Maydell <peter.maydell@linaro.org>2021-07-15 21:39:04 +0100
committerPeter Maydell <peter.maydell@linaro.org>2021-07-15 21:39:04 +0100
commitbd306cfeeececee73ff2cdb3de1229ece72f3b28 (patch)
treeac5b851157be8d15add6f0b2678a67faea0d7ac5 /include/hw/pci/pci_ids.h
parentd4127349e316b5c78645f95dba5922196ac4cc23 (diff)
parent1bd9f1b14d1e9c1498bb03faf4e2bb945cf6542d (diff)
downloadfocaccia-qemu-bd306cfeeececee73ff2cdb3de1229ece72f3b28.tar.gz
focaccia-qemu-bd306cfeeececee73ff2cdb3de1229ece72f3b28.zip
Merge remote-tracking branch 'remotes/awilliam/tags/vfio-update-20210714.0' into staging
VFIO update 2021-07-14

 * Coverity fix to discard listener (David Hildenbrand)

 * MSI-X PBA quirk for BAIDU VFs, additional helper use cases (Cai Huoqing)

# gpg: Signature made Wed 14 Jul 2021 22:31:35 BST
# gpg:                using RSA key 42F6C04E540BD1A99E7B8A90239B9B6E3BB08B22
# gpg:                issuer "alex.williamson@redhat.com"
# gpg: Good signature from "Alex Williamson <alex.williamson@redhat.com>" [full]
# gpg:                 aka "Alex Williamson <alex@shazbot.org>" [full]
# gpg:                 aka "Alex Williamson <alwillia@redhat.com>" [full]
# gpg:                 aka "Alex Williamson <alex.l.williamson@gmail.com>" [full]
# Primary key fingerprint: 42F6 C04E 540B D1A9 9E7B  8A90 239B 9B6E 3BB0 8B22

* remotes/awilliam/tags/vfio-update-20210714.0:
  vfio/pci: Add pba_offset PCI quirk for BAIDU KUNLUN AI processor
  vfio/pci: Change to use vfio_pci_is()
  vfio: Fix CID 1458134 in vfio_register_ram_discard_listener()

Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
Diffstat (limited to 'include/hw/pci/pci_ids.h')
-rw-r--r--include/hw/pci/pci_ids.h3
1 files changed, 3 insertions, 0 deletions
diff --git a/include/hw/pci/pci_ids.h b/include/hw/pci/pci_ids.h
index 5c14681b82..11abe22d46 100644
--- a/include/hw/pci/pci_ids.h
+++ b/include/hw/pci/pci_ids.h
@@ -227,6 +227,9 @@
 #define PCI_VENDOR_ID_FREESCALE          0x1957
 #define PCI_DEVICE_ID_MPC8533E           0x0030
 
+#define PCI_VENDOR_ID_BAIDU              0x1d22
+#define PCI_DEVICE_ID_KUNLUN_VF          0x3685
+
 #define PCI_VENDOR_ID_INTEL              0x8086
 #define PCI_DEVICE_ID_INTEL_82378        0x0484
 #define PCI_DEVICE_ID_INTEL_82441        0x1237