From: Jean Guyader <jean.guyader@eu.citrix.com>
Date: Tue, 22 Nov 2011 18:49:15 +0000 (+0000)
Subject: qemu-xen: Don't redefine libpci (3.1.7) defines.
X-Git-Tag: xen-4.2.0-rc1~34
X-Git-Url: http://xenbits.xensource.com/gitweb?a=commitdiff_plain;h=174d92a73a5d5e67c49501383a519021b72a2468;p=qemu-xen-unstable.git

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@eu.citrix.com>
---

diff --git a/hw/pci.h b/hw/pci.h
index e4cc79adf6..e2c1fd865c 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 9664f8908c..108ac8ea13 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