diff options
author | Peter Maydell <peter.maydell@linaro.org> | 2015-06-02 16:47:31 +0100 |
---|---|---|
committer | Peter Maydell <peter.maydell@linaro.org> | 2015-06-02 16:47:31 +0100 |
commit | 42d58e7c6760cb9c55627c28ae538e27dcf2f144 (patch) | |
tree | 432c6332cb6fc1f64ebbf1210218cdfc060bc63f /hw/pci | |
parent | 3fc827d591679f3e262b9d1f8b34528eabfca8c0 (diff) | |
parent | c25bbf1545a53ac051f9e51d4140e397660c10ae (diff) | |
download | qemu-42d58e7c6760cb9c55627c28ae538e27dcf2f144.zip qemu-42d58e7c6760cb9c55627c28ae538e27dcf2f144.tar.gz qemu-42d58e7c6760cb9c55627c28ae538e27dcf2f144.tar.bz2 |
Merge remote-tracking branch 'remotes/sstabellini/tags/xen-15-06-02-tag' into staging
XSA 128 129 130 131
# gpg: Signature made Tue Jun 2 16:46:38 2015 BST using RSA key ID 70E1AE90
# gpg: Good signature from "Stefano Stabellini <stefano.stabellini@eu.citrix.com>"
* remotes/sstabellini/tags/xen-15-06-02-tag:
xen/pt: unknown PCI config space fields should be read-only
xen/pt: add a few PCI config space field descriptions
xen/pt: mark reserved bits in PCI config space fields
xen/pt: mark all PCIe capability bits read-only
xen/pt: split out calculation of throughable mask in PCI config space handling
xen/pt: correctly handle PM status bit
xen/pt: consolidate PM capability emu_mask
xen/MSI: don't open-code pass-through of enable bit modifications
xen/MSI-X: limit error messages
xen: don't allow guest to control MSI mask register
xen: properly gate host writes of modified PCI CFG contents
Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
Diffstat (limited to 'hw/pci')
-rw-r--r-- | hw/pci/msi.c | 4 |
1 files changed, 0 insertions, 4 deletions
diff --git a/hw/pci/msi.c b/hw/pci/msi.c index c111dba..f9c0484 100644 --- a/hw/pci/msi.c +++ b/hw/pci/msi.c @@ -21,10 +21,6 @@ #include "hw/pci/msi.h" #include "qemu/range.h" -/* Eventually those constants should go to Linux pci_regs.h */ -#define PCI_MSI_PENDING_32 0x10 -#define PCI_MSI_PENDING_64 0x14 - /* PCI_MSI_ADDRESS_LO */ #define PCI_MSI_ADDRESS_LO_MASK (~0x3) |