[Xen-changelog] [qemu-xen-4.1-testing] qemu-xen: Don't redefine libpci (3.1.7) defines.

[patchbot@xxxxxxx]

commit 3981d218912e186cb4205ee6732f446c177a36a2
Author: Jean Guyader <jean.guyader@xxxxxxxxxxxxx>
Date:   Tue Nov 22 18:49:15 2011 +0000

    qemu-xen: Don't redefine libpci (3.1.7) defines.
    
    These values are already defined by the libpci heders in the version
    3.1.7.
    
    PCI_STATUS_66MHZ
    PCI_STATUS_RESERVED2
    PCI_STATUS_FAST_BACK
    PCI_MSIX_TABSIZE
    
    Signed-off-by: Jean Guyader <jean.guyader@xxxxxxxxxxxxx>
    (cherry picked from commit 174d92a73a5d5e67c49501383a519021b72a2468)
---
 hw/pci.h    |    6 ++++++
 hw/pt-msi.h |    2 ++
 2 files changed, 8 insertions(+), 0 deletions(-)

diff --git a/hw/pci.h b/hw/pci.h
index e4cc79a..e2c1fd8 100644
--- a/hw/pci.h
+++ b/hw/pci.h
@@ -177,9 +177,15 @@ typedef struct PCIIORegion {
 #define PCI_STATUS_RESERVED1   0x007
 #define PCI_STATUS_INT_STATUS  0x008
 #define PCI_STATUS_CAPABILITIES        0x010
+#ifndef PCI_STATUS_66MHZ
 #define PCI_STATUS_66MHZ       0x020
+#endif
+#ifndef PCI_STATUS_RESERVED2
 #define PCI_STATUS_RESERVED2   0x040
+#endif
+#ifndef PCI_STATUS_FAST_BACK
 #define PCI_STATUS_FAST_BACK   0x080
+#endif
 #define PCI_STATUS_DEVSEL      0x600
 
 #define PCI_STATUS_RESERVED_MASK_LO (PCI_STATUS_RESERVED1 | \
diff --git a/hw/pt-msi.h b/hw/pt-msi.h
index 9664f89..108ac8e 100644
--- a/hw/pt-msi.h
+++ b/hw/pt-msi.h
@@ -26,7 +26,9 @@
 /* MSI-X */
 #define  PCI_MSIX_ENABLE    0x8000
 #define  PCI_MSIX_MASK      0x4000
+#ifndef PCI_MSIX_TABSIZE
 #define  PCI_MSIX_TABSIZE   0x03ff
+#endif
 #define PCI_MSIX_TABLE      4
 #define PCI_MSIX_PBA        8
 #define  PCI_MSIX_BIR       0x7
--
generated by git-patchbot for /home/xen/git/qemu-xen-4.1-testing.git

_______________________________________________
Xen-changelog mailing list
Xen-changelog@xxxxxxxxxxxxxxxxxxx
http://lists.xensource.com/xen-changelog