Housecleaning: VMIROM is dead

VMI was gone a long time ago. There are a few remnants
still present.
- includeCheck has a VMIROM macro that can go, plus all
locations it was copy-n-pasted into
- vmcore/public/paravirtualInterface.h was totally unreferenced.

Signed-off-by: Dmitry Torokhov <dtor@vmware.com>

diff --git a/open-vm-tools/lib/include/community_source.h b/open-vm-tools/lib/include/community_source.h
index 5e477378f6f284837f5d1b9befebab7b8c835b6a..3533a435b033cdbdc7e37b3c25262c38ffff268e 100644 (file)
--- a/open-vm-tools/lib/include/community_source.h
+++ b/open-vm-tools/lib/include/community_source.h
@@ -48,7 +48,6 @@
 #define INCLUDE_ALLOW_VMK_MODULE
 #define INCLUDE_ALLOW_DISTRIBUTE
 #define INCLUDE_ALLOW_VMCORE
-#define INCLUDE_ALLOW_VMIROM
 #include "includeCheck.h"
 
 /* 

diff --git a/open-vm-tools/lib/include/compat/compat_stdarg.h b/open-vm-tools/lib/include/compat/compat_stdarg.h
index 7e7d44173ccca253c38e63c7ffe85cbab49473c2..93a33fb7c15901f5fcfb51a48e221ba223979652 100644 (file)
--- a/open-vm-tools/lib/include/compat/compat_stdarg.h
+++ b/open-vm-tools/lib/include/compat/compat_stdarg.h
@@ -50,7 +50,6 @@
 #define INCLUDE_ALLOW_VMK_MODULE
 #define INCLUDE_ALLOW_DISTRIBUTE
 #define INCLUDE_ALLOW_VMCORE
-#define INCLUDE_ALLOW_VMIROM
 #include "includeCheck.h"
 
 #include <stdarg.h>

diff --git a/open-vm-tools/lib/include/includeCheck.h b/open-vm-tools/lib/include/includeCheck.h
index 8a7ab0924db482ff9f2c69279e38a9416b7358fc..0dfb4ae6f52f6582c6feb576d9064d22af59ea26 100644 (file)
--- a/open-vm-tools/lib/include/includeCheck.h
+++ b/open-vm-tools/lib/include/includeCheck.h
@@ -73,7 +73,6 @@
  *     INCLUDE_ALLOW_DISTRIBUTE
  *     INCLUDE_ALLOW_VMK_MODULE
  *      INCLUDE_ALLOW_VMKDRIVERS
- *      INCLUDE_ALLOW_VMIROM
  *      INCLUDE_ALLOW_MKS
  *
  * Then include this file.
@@ -155,11 +154,6 @@
 #undef INCLUDE_ALLOW_VMK_MODULE
 #undef INCLUDE_ALLOW_VMKDRIVERS
 
-#if defined VMIROM && ! defined INCLUDE_ALLOW_VMIROM
-#error "The surrounding include file is not allowed in vmirom."
-#endif
-#undef INCLUDE_ALLOW_VMIROM
-
 #if defined INCLUDE_ALLOW_MKS && !(defined COREMKS)
 #error "The surrounding include file is not allowed outside of the MKS."
 #endif

diff --git a/open-vm-tools/lib/include/vm_assert.h b/open-vm-tools/lib/include/vm_assert.h
index e0a691f57789df1418e4bf9fb8112d9d3dbd261b..d0980426ff11a6844dc4a2a3a878f301583e2a96 100644 (file)
--- a/open-vm-tools/lib/include/vm_assert.h
+++ b/open-vm-tools/lib/include/vm_assert.h
@@ -79,7 +79,6 @@
 #define INCLUDE_ALLOW_VMK_MODULE
 #define INCLUDE_ALLOW_DISTRIBUTE
 #define INCLUDE_ALLOW_VMCORE
-#define INCLUDE_ALLOW_VMIROM
 #include "includeCheck.h"
 
 // XXX not necessary except some places include vm_assert.h improperly

diff --git a/open-vm-tools/lib/include/vm_atomic.h b/open-vm-tools/lib/include/vm_atomic.h
index 2a983c7d9c6b9dc6c159a1800d7aa46eb0a21178..81ea4b6a06c4c5e2a99a9628629978e3f25e020e 100644 (file)
--- a/open-vm-tools/lib/include/vm_atomic.h
+++ b/open-vm-tools/lib/include/vm_atomic.h
@@ -46,7 +46,6 @@
 #define INCLUDE_ALLOW_VMKERNEL
 #define INCLUDE_ALLOW_DISTRIBUTE
 #define INCLUDE_ALLOW_VMCORE
-#define INCLUDE_ALLOW_VMIROM
 #include "includeCheck.h"
 
 #include "vm_basic_types.h"

diff --git a/open-vm-tools/lib/include/vm_basic_asm.h b/open-vm-tools/lib/include/vm_basic_asm.h
index 70c5a23cc1e96946bbd70a716793a76c54480dbb..afac9b4ce7ba34fcd2b4612345c59a4c5ec880d6 100644 (file)
--- a/open-vm-tools/lib/include/vm_basic_asm.h
+++ b/open-vm-tools/lib/include/vm_basic_asm.h
@@ -49,7 +49,6 @@
 #define INCLUDE_ALLOW_VMKERNEL
 #define INCLUDE_ALLOW_DISTRIBUTE
 #define INCLUDE_ALLOW_VMCORE
-#define INCLUDE_ALLOW_VMIROM
 #include "includeCheck.h"
 
 #include "vm_basic_types.h"

diff --git a/open-vm-tools/lib/include/vm_basic_asm_x86.h b/open-vm-tools/lib/include/vm_basic_asm_x86.h
index 960c4f8c79fe332d3d71e9664008158fa0d8d912..e4f4d5ba3f395014ce1694b3f89960dfeaee40c0 100644 (file)
--- a/open-vm-tools/lib/include/vm_basic_asm_x86.h
+++ b/open-vm-tools/lib/include/vm_basic_asm_x86.h
@@ -47,7 +47,6 @@
 #define INCLUDE_ALLOW_VMKERNEL
 #define INCLUDE_ALLOW_DISTRIBUTE
 #define INCLUDE_ALLOW_VMCORE
-#define INCLUDE_ALLOW_VMIROM
 #include "includeCheck.h"
 
 #ifdef VM_X86_64

diff --git a/open-vm-tools/lib/include/vm_basic_defs.h b/open-vm-tools/lib/include/vm_basic_defs.h
index acf9d195f00d558c98e69b7a7b4229f5a48f4e96..84f4e33d805c8130a93a359eda75d83e9b2b4ed0 100644 (file)
--- a/open-vm-tools/lib/include/vm_basic_defs.h
+++ b/open-vm-tools/lib/include/vm_basic_defs.h
@@ -76,7 +76,6 @@
 #define INCLUDE_ALLOW_VMK_MODULE
 #define INCLUDE_ALLOW_DISTRIBUTE
 #define INCLUDE_ALLOW_VMCORE
-#define INCLUDE_ALLOW_VMIROM
 #include "includeCheck.h"
 #include "vm_basic_types.h" // For INLINE.
 

diff --git a/open-vm-tools/lib/include/vm_basic_math.h b/open-vm-tools/lib/include/vm_basic_math.h
index 4811f0a712a843d6e45e02acf5e7373df9e0b13c..f2c7ffcfee2741621c45b8df5db967094e3afe73 100644 (file)
--- a/open-vm-tools/lib/include/vm_basic_math.h
+++ b/open-vm-tools/lib/include/vm_basic_math.h
@@ -34,7 +34,6 @@
 #define INCLUDE_ALLOW_VMK_MODULE
 #define INCLUDE_ALLOW_DISTRIBUTE
 #define INCLUDE_ALLOW_VMCORE
-#define INCLUDE_ALLOW_VMIROM
 #include "includeCheck.h"
 #include "vm_basic_types.h" // For INLINE.
 #include "vm_basic_asm.h"   // For Div64...

diff --git a/open-vm-tools/lib/include/vm_basic_types.h b/open-vm-tools/lib/include/vm_basic_types.h
index 4c87ca9e4cc4cccce6dd695be6e30136e1d55db6..d2093cbc57daf75ac4a66e783141f86e26f0a596 100644 (file)
--- a/open-vm-tools/lib/include/vm_basic_types.h
+++ b/open-vm-tools/lib/include/vm_basic_types.h
@@ -78,7 +78,6 @@
 #define INCLUDE_ALLOW_VMK_MODULE
 #define INCLUDE_ALLOW_DISTRIBUTE
 #define INCLUDE_ALLOW_VMCORE
-#define INCLUDE_ALLOW_VMIROM
 #include "includeCheck.h"
 
 /* STRICT ANSI means the Xserver build and X defines Bool differently. */