Merge fix-build-warnings into ioemu-compil.

diff --git a/master/fix-build-warnings b/master/fix-build-warnings
deleted file mode 100644 (file)
index 9b2d41c..0000000
--- a/master/fix-build-warnings
+++ /dev/null
@@ -1,19 +0,0 @@
-diff -Nur a/hw/pci.h b/hw/pci.h
---- a/hw/pci.h 2009-05-13 14:31:58.000000000 -0400
-+++ b/hw/pci.h 2009-05-13 16:51:34.000000000 -0400
-@@ -168,9 +168,13 @@
- #define PCI_STATUS_RESERVED1  0x007
- #define PCI_STATUS_INT_STATUS 0x008
- #define PCI_STATUS_CAPABILITIES       0x010
--#define PCI_STATUS_66MHZ      0x020
-+#ifndef PCI_STATUS_66MHZ
-+#define PCI_STATUS_66MHZ        0x020
-+#endif
- #define PCI_STATUS_RESERVED2  0x040
--#define PCI_STATUS_FAST_BACK  0x080
-+#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/master/ioemu-compil b/master/ioemu-compil
index 66517cbe4814a588431355817233cd8588c4b4be..dce5005e8deb9cf0aed64fda78da9bef5724c27a 100644 (file)
--- a/master/ioemu-compil
+++ b/master/ioemu-compil
@@ -1,3 +1,23 @@
+diff --git a/hw/pci.h b/hw/pci.h
+index ee13a36..4e9deaa 100644
+--- a/hw/pci.h
++++ b/hw/pci.h
+@@ -168,9 +168,13 @@ typedef struct PCIIORegion {
+ #define PCI_STATUS_RESERVED1  0x007
+ #define PCI_STATUS_INT_STATUS 0x008
+ #define PCI_STATUS_CAPABILITIES       0x010
+-#define PCI_STATUS_66MHZ      0x020
++#ifndef PCI_STATUS_66MHZ
++#define PCI_STATUS_66MHZ        0x020
++#endif
+ #define PCI_STATUS_RESERVED2  0x040
+-#define PCI_STATUS_FAST_BACK  0x080
++#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/xen-hooks.mak b/xen-hooks.mak
 index c6b4f8c..7c22471 100644
 --- a/xen-hooks.mak

diff --git a/master/series b/master/series
index c2a280cfbf924e4dc98d3516adc3e021ffa566b6..1f27ca9234085606b2b6fe21af874507b1d2f83e 100644 (file)
--- a/master/series
+++ b/master/series
@@ -15,7 +15,6 @@ suspend-by-signal
 battery-management
 oem-features
 thermal-management
-fix-build-warnings
 
 
 vga-passthrough