From: VMware, Inc <> Date: Wed, 20 Jan 2010 21:30:40 +0000 (-0800) Subject: Remove INCLUDE_ALLOW_VMMEXT. We no longer consider it useful. X-Git-Tag: 2010.01.19-226760~22 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=42b163cb463d4a32552e1dd3fa55bbad17723377;p=thirdparty%2Fopen-vm-tools.git Remove INCLUDE_ALLOW_VMMEXT. We no longer consider it useful. Signed-off-by: Marcelo Vanzin --- diff --git a/open-vm-tools/lib/include/backdoor_def.h b/open-vm-tools/lib/include/backdoor_def.h index 7fc33e45c..f79ec0da4 100644 --- a/open-vm-tools/lib/include/backdoor_def.h +++ b/open-vm-tools/lib/include/backdoor_def.h @@ -44,7 +44,7 @@ #define INCLUDE_ALLOW_MODULE #define INCLUDE_ALLOW_USERLEVEL -#define INCLUDE_ALLOW_VMMEXT + #define INCLUDE_ALLOW_VMCORE #define INCLUDE_ALLOW_VMKERNEL #include "includeCheck.h" diff --git a/open-vm-tools/lib/include/community_source.h b/open-vm-tools/lib/include/community_source.h index 12bc27489..5e477378f 100644 --- a/open-vm-tools/lib/include/community_source.h +++ b/open-vm-tools/lib/include/community_source.h @@ -40,7 +40,7 @@ #define _COMMUNITY_SOURCE_H_ #define INCLUDE_ALLOW_USERLEVEL -#define INCLUDE_ALLOW_VMMEXT + #define INCLUDE_ALLOW_MODULE #define INCLUDE_ALLOW_VMMON #define INCLUDE_ALLOW_VMKERNEL diff --git a/open-vm-tools/lib/include/compat/compat_stdarg.h b/open-vm-tools/lib/include/compat/compat_stdarg.h index a0e12fce6..7e7d44173 100644 --- a/open-vm-tools/lib/include/compat/compat_stdarg.h +++ b/open-vm-tools/lib/include/compat/compat_stdarg.h @@ -42,7 +42,7 @@ #define _COMPAT_STDARG_H 1 #define INCLUDE_ALLOW_USERLEVEL -#define INCLUDE_ALLOW_VMMEXT + #define INCLUDE_ALLOW_MODULE #define INCLUDE_ALLOW_VMMON #define INCLUDE_ALLOW_VMKERNEL diff --git a/open-vm-tools/lib/include/cpuid_info.h b/open-vm-tools/lib/include/cpuid_info.h index 4527694b6..1751ff443 100644 --- a/open-vm-tools/lib/include/cpuid_info.h +++ b/open-vm-tools/lib/include/cpuid_info.h @@ -23,7 +23,7 @@ #define INCLUDE_ALLOW_VMMON #define INCLUDE_ALLOW_VMCORE #define INCLUDE_ALLOW_VMKERNEL -#define INCLUDE_ALLOW_VMMEXT + #include "includeCheck.h" #include "vm_basic_asm.h" diff --git a/open-vm-tools/lib/include/guest_msg_def.h b/open-vm-tools/lib/include/guest_msg_def.h index e51a83429..ebc3f2b4e 100644 --- a/open-vm-tools/lib/include/guest_msg_def.h +++ b/open-vm-tools/lib/include/guest_msg_def.h @@ -43,7 +43,7 @@ #define INCLUDE_ALLOW_MODULE #define INCLUDE_ALLOW_USERLEVEL -#define INCLUDE_ALLOW_VMMEXT + #include "includeCheck.h" diff --git a/open-vm-tools/lib/include/includeCheck.h b/open-vm-tools/lib/include/includeCheck.h index 0ea2d7797..c414d6daf 100644 --- a/open-vm-tools/lib/include/includeCheck.h +++ b/open-vm-tools/lib/include/includeCheck.h @@ -67,7 +67,6 @@ * * INCLUDE_ALLOW_VMX * INCLUDE_ALLOW_USERLEVEL - * INCLUDE_ALLOW_VMMEXT * INCLUDE_ALLOW_VMCORE * INCLUDE_ALLOW_MODULE * INCLUDE_ALLOW_VMKERNEL @@ -126,12 +125,6 @@ #endif #undef INCLUDE_ALLOW_USERLEVEL -#if defined VMM && !defined VMCORE && \ - !defined INCLUDE_ALLOW_VMMEXT -#error "The surrounding include file is not allowed in the monitor." -#endif -#undef INCLUDE_ALLOW_VMMEXT - #if defined MODULE && !defined VMKERNEL_MODULE && \ !defined VMMON && !defined INCLUDE_ALLOW_MODULE #error "The surrounding include file is not allowed in driver modules." diff --git a/open-vm-tools/lib/include/log.h b/open-vm-tools/lib/include/log.h index 3b1e38d9a..000dd7b08 100644 --- a/open-vm-tools/lib/include/log.h +++ b/open-vm-tools/lib/include/log.h @@ -21,7 +21,7 @@ #define INCLUDE_ALLOW_USERLEVEL #define INCLUDE_ALLOW_VMCORE -#define INCLUDE_ALLOW_VMMEXT + #include "includeCheck.h" #include diff --git a/open-vm-tools/lib/include/loglevel_defs.h b/open-vm-tools/lib/include/loglevel_defs.h index 50ee510b0..e36b6bb56 100644 --- a/open-vm-tools/lib/include/loglevel_defs.h +++ b/open-vm-tools/lib/include/loglevel_defs.h @@ -21,7 +21,7 @@ #define INCLUDE_ALLOW_MODULE #define INCLUDE_ALLOW_USERLEVEL -#define INCLUDE_ALLOW_VMMEXT + #define INCLUDE_ALLOW_VMCORE #include "includeCheck.h" diff --git a/open-vm-tools/lib/include/util_shared.h b/open-vm-tools/lib/include/util_shared.h index d547947fb..16811a88d 100644 --- a/open-vm-tools/lib/include/util_shared.h +++ b/open-vm-tools/lib/include/util_shared.h @@ -17,7 +17,7 @@ *********************************************************/ #define INCLUDE_ALLOW_USERLEVEL -#define INCLUDE_ALLOW_VMMEXT + #define INCLUDE_ALLOW_VMCORE #define INCLUDE_ALLOW_VMKERNEL #include "includeCheck.h" diff --git a/open-vm-tools/lib/include/vcpuid.h b/open-vm-tools/lib/include/vcpuid.h index a39addfa1..bd2f907ea 100644 --- a/open-vm-tools/lib/include/vcpuid.h +++ b/open-vm-tools/lib/include/vcpuid.h @@ -27,7 +27,7 @@ #define _VCPUID_H_ #define INCLUDE_ALLOW_USERLEVEL -#define INCLUDE_ALLOW_VMMEXT + #define INCLUDE_ALLOW_MODULE #define INCLUDE_ALLOW_VMMON #define INCLUDE_ALLOW_VMKERNEL diff --git a/open-vm-tools/lib/include/vm_assert.h b/open-vm-tools/lib/include/vm_assert.h index 795fc4736..6fa7a1e2e 100644 --- a/open-vm-tools/lib/include/vm_assert.h +++ b/open-vm-tools/lib/include/vm_assert.h @@ -71,7 +71,7 @@ #define _VM_ASSERT_H_ #define INCLUDE_ALLOW_USERLEVEL -#define INCLUDE_ALLOW_VMMEXT + #define INCLUDE_ALLOW_MODULE #define INCLUDE_ALLOW_VMMON #define INCLUDE_ALLOW_VMKERNEL diff --git a/open-vm-tools/lib/include/vm_atomic.h b/open-vm-tools/lib/include/vm_atomic.h index 1c3fbffae..82d22ef8f 100644 --- a/open-vm-tools/lib/include/vm_atomic.h +++ b/open-vm-tools/lib/include/vm_atomic.h @@ -40,7 +40,7 @@ //#define FAKE_ATOMIC /* defined if true atomic not needed */ #define INCLUDE_ALLOW_USERLEVEL -#define INCLUDE_ALLOW_VMMEXT + #define INCLUDE_ALLOW_MODULE #define INCLUDE_ALLOW_VMMON #define INCLUDE_ALLOW_VMKDRIVERS diff --git a/open-vm-tools/lib/include/vm_basic_asm.h b/open-vm-tools/lib/include/vm_basic_asm.h index 06a65c689..c8c026ea0 100644 --- a/open-vm-tools/lib/include/vm_basic_asm.h +++ b/open-vm-tools/lib/include/vm_basic_asm.h @@ -42,7 +42,7 @@ #define _VM_BASIC_ASM_H_ #define INCLUDE_ALLOW_USERLEVEL -#define INCLUDE_ALLOW_VMMEXT + #define INCLUDE_ALLOW_MODULE #define INCLUDE_ALLOW_VMMON #define INCLUDE_ALLOW_VMK_MODULE 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 4735c32ff..864429e91 100644 --- a/open-vm-tools/lib/include/vm_basic_asm_x86.h +++ b/open-vm-tools/lib/include/vm_basic_asm_x86.h @@ -40,7 +40,7 @@ #define _VM_BASIC_ASM_X86_H_ #define INCLUDE_ALLOW_USERLEVEL -#define INCLUDE_ALLOW_VMMEXT + #define INCLUDE_ALLOW_MODULE #define INCLUDE_ALLOW_VMMON #define INCLUDE_ALLOW_VMK_MODULE diff --git a/open-vm-tools/lib/include/vm_basic_asm_x86_64.h b/open-vm-tools/lib/include/vm_basic_asm_x86_64.h index b9e903248..d73d5515e 100644 --- a/open-vm-tools/lib/include/vm_basic_asm_x86_64.h +++ b/open-vm-tools/lib/include/vm_basic_asm_x86_64.h @@ -40,7 +40,7 @@ #define _VM_BASIC_ASM_X86_64_H_ #define INCLUDE_ALLOW_USERLEVEL -#define INCLUDE_ALLOW_VMMEXT + #define INCLUDE_ALLOW_MODULE #define INCLUDE_ALLOW_VMMON #define INCLUDE_ALLOW_VMK_MODULE diff --git a/open-vm-tools/lib/include/vm_basic_defs.h b/open-vm-tools/lib/include/vm_basic_defs.h index 329f24975..89771fed7 100644 --- a/open-vm-tools/lib/include/vm_basic_defs.h +++ b/open-vm-tools/lib/include/vm_basic_defs.h @@ -68,7 +68,7 @@ #define _VM_BASIC_DEFS_H_ #define INCLUDE_ALLOW_USERLEVEL -#define INCLUDE_ALLOW_VMMEXT + #define INCLUDE_ALLOW_MODULE #define INCLUDE_ALLOW_VMMON #define INCLUDE_ALLOW_VMKERNEL diff --git a/open-vm-tools/lib/include/vm_basic_math.h b/open-vm-tools/lib/include/vm_basic_math.h index e2fc84972..d5b4bbce5 100644 --- a/open-vm-tools/lib/include/vm_basic_math.h +++ b/open-vm-tools/lib/include/vm_basic_math.h @@ -26,7 +26,7 @@ #define _VM_BASIC_MATH_H_ #define INCLUDE_ALLOW_USERLEVEL -#define INCLUDE_ALLOW_VMMEXT + #define INCLUDE_ALLOW_MODULE #define INCLUDE_ALLOW_VMMON #define INCLUDE_ALLOW_VMKERNEL diff --git a/open-vm-tools/lib/include/vm_basic_types.h b/open-vm-tools/lib/include/vm_basic_types.h index ee0016857..40d955954 100644 --- a/open-vm-tools/lib/include/vm_basic_types.h +++ b/open-vm-tools/lib/include/vm_basic_types.h @@ -70,7 +70,7 @@ #define _VM_BASIC_TYPES_H_ #define INCLUDE_ALLOW_USERLEVEL -#define INCLUDE_ALLOW_VMMEXT + #define INCLUDE_ALLOW_MODULE #define INCLUDE_ALLOW_VMMON #define INCLUDE_ALLOW_VMKERNEL diff --git a/open-vm-tools/lib/include/vm_device_version.h b/open-vm-tools/lib/include/vm_device_version.h index d7cfb4da1..e1d4a0704 100644 --- a/open-vm-tools/lib/include/vm_device_version.h +++ b/open-vm-tools/lib/include/vm_device_version.h @@ -20,7 +20,7 @@ #define VM_DEVICE_VERSION_H #define INCLUDE_ALLOW_USERLEVEL -#define INCLUDE_ALLOW_VMMEXT + #define INCLUDE_ALLOW_MODULE #define INCLUDE_ALLOW_VMKERNEL #define INCLUDE_ALLOW_VMCORE diff --git a/open-vm-tools/lib/include/vm_product.h b/open-vm-tools/lib/include/vm_product.h index 90c87be2f..015bc8bad 100644 --- a/open-vm-tools/lib/include/vm_product.h +++ b/open-vm-tools/lib/include/vm_product.h @@ -21,7 +21,7 @@ #define VM_PRODUCT_H #define INCLUDE_ALLOW_USERLEVEL -#define INCLUDE_ALLOW_VMMEXT + #define INCLUDE_ALLOW_MODULE #define INCLUDE_ALLOW_VMMON #define INCLUDE_ALLOW_VMKERNEL diff --git a/open-vm-tools/lib/include/vm_tools_version.h b/open-vm-tools/lib/include/vm_tools_version.h index 5a76c3759..37a970c58 100644 --- a/open-vm-tools/lib/include/vm_tools_version.h +++ b/open-vm-tools/lib/include/vm_tools_version.h @@ -22,7 +22,7 @@ #ifndef RC_INVOKED #define INCLUDE_ALLOW_USERLEVEL -#define INCLUDE_ALLOW_VMMEXT + #define INCLUDE_ALLOW_MODULE #define INCLUDE_ALLOW_VMMON #define INCLUDE_ALLOW_VMKERNEL diff --git a/open-vm-tools/lib/include/vm_version.h b/open-vm-tools/lib/include/vm_version.h index 180c1bf7d..caf368bbe 100644 --- a/open-vm-tools/lib/include/vm_version.h +++ b/open-vm-tools/lib/include/vm_version.h @@ -21,7 +21,7 @@ #define VM_VERSION_H #define INCLUDE_ALLOW_USERLEVEL -#define INCLUDE_ALLOW_VMMEXT + #define INCLUDE_ALLOW_MODULE #define INCLUDE_ALLOW_VMMON #define INCLUDE_ALLOW_VMKERNEL diff --git a/open-vm-tools/lib/include/x86cpuid.h b/open-vm-tools/lib/include/x86cpuid.h index 169732a0e..05a3ee0a1 100644 --- a/open-vm-tools/lib/include/x86cpuid.h +++ b/open-vm-tools/lib/include/x86cpuid.h @@ -37,7 +37,7 @@ #define INCLUDE_ALLOW_USERLEVEL #define INCLUDE_ALLOW_VMX -#define INCLUDE_ALLOW_VMMEXT + #define INCLUDE_ALLOW_VMKERNEL #define INCLUDE_ALLOW_MODULE #define INCLUDE_ALLOW_DISTRIBUTE diff --git a/open-vm-tools/lib/include/x86cpuid_asm.h b/open-vm-tools/lib/include/x86cpuid_asm.h index c3011ca77..c02e3299f 100644 --- a/open-vm-tools/lib/include/x86cpuid_asm.h +++ b/open-vm-tools/lib/include/x86cpuid_asm.h @@ -40,7 +40,7 @@ #define _X86CPUID_ASM_H_ #define INCLUDE_ALLOW_USERLEVEL -#define INCLUDE_ALLOW_VMMEXT + #define INCLUDE_ALLOW_MODULE #define INCLUDE_ALLOW_VMMON #define INCLUDE_ALLOW_VMK_MODULE diff --git a/open-vm-tools/modules/freebsd/vmhgfs/sha1.h b/open-vm-tools/modules/freebsd/vmhgfs/sha1.h index 77c2a208e..0403b2b91 100644 --- a/open-vm-tools/modules/freebsd/vmhgfs/sha1.h +++ b/open-vm-tools/modules/freebsd/vmhgfs/sha1.h @@ -26,7 +26,7 @@ #define _SHA1_H_ #define INCLUDE_ALLOW_USERLEVEL -#define INCLUDE_ALLOW_VMMEXT + #define INCLUDE_ALLOW_VMCORE #include "includeCheck.h" diff --git a/open-vm-tools/modules/linux/pvscsi/pvscsi_defs.h b/open-vm-tools/modules/linux/pvscsi/pvscsi_defs.h index 8eccb04ea..9b741d2d5 100644 --- a/open-vm-tools/modules/linux/pvscsi/pvscsi_defs.h +++ b/open-vm-tools/modules/linux/pvscsi/pvscsi_defs.h @@ -20,7 +20,7 @@ #define __PVSCSI_DEFS_H__ #define INCLUDE_ALLOW_MODULE -#define INCLUDE_ALLOW_VMMEXT + #define INCLUDE_ALLOW_VMX #define INCLUDE_ALLOW_VMCORE #define INCLUDE_ALLOW_VMKERNEL diff --git a/open-vm-tools/modules/linux/pvscsi/scsi_defs.h b/open-vm-tools/modules/linux/pvscsi/scsi_defs.h index 935818fdc..1f35bfa64 100644 --- a/open-vm-tools/modules/linux/pvscsi/scsi_defs.h +++ b/open-vm-tools/modules/linux/pvscsi/scsi_defs.h @@ -26,7 +26,7 @@ #define _SCSI_DEFS_H_ #define INCLUDE_ALLOW_USERLEVEL -#define INCLUDE_ALLOW_VMMEXT + #define INCLUDE_ALLOW_MODULE #define INCLUDE_ALLOW_VMK_MODULE #define INCLUDE_ALLOW_VMKERNEL diff --git a/open-vm-tools/modules/linux/shared/vmci_call_defs.h b/open-vm-tools/modules/linux/shared/vmci_call_defs.h index 7b48ce14d..02384a0fa 100644 --- a/open-vm-tools/modules/linux/shared/vmci_call_defs.h +++ b/open-vm-tools/modules/linux/shared/vmci_call_defs.h @@ -20,7 +20,7 @@ #define _VMCI_CALL_DEFS_H_ #define INCLUDE_ALLOW_USERLEVEL -#define INCLUDE_ALLOW_VMMEXT + #define INCLUDE_ALLOW_MODULE #define INCLUDE_ALLOW_VMMON #define INCLUDE_ALLOW_VMCORE diff --git a/open-vm-tools/modules/linux/shared/vmci_defs.h b/open-vm-tools/modules/linux/shared/vmci_defs.h index 87adc1925..d09e9b210 100644 --- a/open-vm-tools/modules/linux/shared/vmci_defs.h +++ b/open-vm-tools/modules/linux/shared/vmci_defs.h @@ -20,7 +20,7 @@ #define _VMCI_DEF_H_ #define INCLUDE_ALLOW_USERLEVEL -#define INCLUDE_ALLOW_VMMEXT + #define INCLUDE_ALLOW_MODULE #define INCLUDE_ALLOW_VMMON #define INCLUDE_ALLOW_VMCORE diff --git a/open-vm-tools/modules/linux/shared/vmci_infrastructure.h b/open-vm-tools/modules/linux/shared/vmci_infrastructure.h index 35a5b5329..291c79783 100644 --- a/open-vm-tools/modules/linux/shared/vmci_infrastructure.h +++ b/open-vm-tools/modules/linux/shared/vmci_infrastructure.h @@ -26,7 +26,7 @@ #define _VMCI_INFRASTRUCTURE_H_ #define INCLUDE_ALLOW_USERLEVEL -#define INCLUDE_ALLOW_VMMEXT + #define INCLUDE_ALLOW_MODULE #define INCLUDE_ALLOW_VMMON #define INCLUDE_ALLOW_VMCORE diff --git a/open-vm-tools/modules/shared/vmxnet/net.h b/open-vm-tools/modules/shared/vmxnet/net.h index 7898a445d..aa3b92e16 100644 --- a/open-vm-tools/modules/shared/vmxnet/net.h +++ b/open-vm-tools/modules/shared/vmxnet/net.h @@ -46,7 +46,7 @@ #define INCLUDE_ALLOW_USERLEVEL #define INCLUDE_ALLOW_MODULE -#define INCLUDE_ALLOW_VMMEXT + #include "includeCheck.h" #include "vm_device_version.h" diff --git a/open-vm-tools/modules/shared/vmxnet/net_sg.h b/open-vm-tools/modules/shared/vmxnet/net_sg.h index 77410e099..f6c30fb2b 100644 --- a/open-vm-tools/modules/shared/vmxnet/net_sg.h +++ b/open-vm-tools/modules/shared/vmxnet/net_sg.h @@ -41,7 +41,7 @@ #define _NET_SG_H #define INCLUDE_ALLOW_USERLEVEL -#define INCLUDE_ALLOW_VMMEXT + #define INCLUDE_ALLOW_MODULE #define INCLUDE_ALLOW_VMK_MODULE #define INCLUDE_ALLOW_VMKERNEL diff --git a/open-vm-tools/modules/shared/vmxnet/vmnet_def.h b/open-vm-tools/modules/shared/vmxnet/vmnet_def.h index f79e8efe3..5f918c94a 100644 --- a/open-vm-tools/modules/shared/vmxnet/vmnet_def.h +++ b/open-vm-tools/modules/shared/vmxnet/vmnet_def.h @@ -40,7 +40,7 @@ #define _VMNET_DEF_H_ #define INCLUDE_ALLOW_USERLEVEL -#define INCLUDE_ALLOW_VMMEXT + #define INCLUDE_ALLOW_MODULE #define INCLUDE_ALLOW_VMK_MODULE #define INCLUDE_ALLOW_VMKERNEL diff --git a/open-vm-tools/modules/shared/vmxnet/vmxnet2_def.h b/open-vm-tools/modules/shared/vmxnet/vmxnet2_def.h index ae7c5c2c6..2e29a9471 100644 --- a/open-vm-tools/modules/shared/vmxnet/vmxnet2_def.h +++ b/open-vm-tools/modules/shared/vmxnet/vmxnet2_def.h @@ -34,7 +34,7 @@ #define _VMXNET2_DEF_H_ #define INCLUDE_ALLOW_USERLEVEL -#define INCLUDE_ALLOW_VMMEXT + #define INCLUDE_ALLOW_MODULE #define INCLUDE_ALLOW_VMK_MODULE #define INCLUDE_ALLOW_VMKERNEL diff --git a/open-vm-tools/modules/shared/vmxnet/vmxnet3_defs.h b/open-vm-tools/modules/shared/vmxnet/vmxnet3_defs.h index 16e7505c4..04d7716ae 100644 --- a/open-vm-tools/modules/shared/vmxnet/vmxnet3_defs.h +++ b/open-vm-tools/modules/shared/vmxnet/vmxnet3_defs.h @@ -42,7 +42,7 @@ #define INCLUDE_ALLOW_USERLEVEL #define INCLUDE_ALLOW_VMKERNEL -#define INCLUDE_ALLOW_VMMEXT + #define INCLUDE_ALLOW_VMCORE #define INCLUDE_ALLOW_MODULE #include "includeCheck.h" diff --git a/open-vm-tools/modules/shared/vmxnet/vmxnet_def.h b/open-vm-tools/modules/shared/vmxnet/vmxnet_def.h index 90b38f2fa..703466c99 100644 --- a/open-vm-tools/modules/shared/vmxnet/vmxnet_def.h +++ b/open-vm-tools/modules/shared/vmxnet/vmxnet_def.h @@ -34,7 +34,7 @@ #define _VMXNET_DEF_H_ #define INCLUDE_ALLOW_USERLEVEL -#define INCLUDE_ALLOW_VMMEXT + #define INCLUDE_ALLOW_MODULE #define INCLUDE_ALLOW_VMK_MODULE #define INCLUDE_ALLOW_VMKERNEL diff --git a/open-vm-tools/modules/solaris/vmhgfs/sha1.h b/open-vm-tools/modules/solaris/vmhgfs/sha1.h index 83b3b3df5..76b3c536c 100644 --- a/open-vm-tools/modules/solaris/vmhgfs/sha1.h +++ b/open-vm-tools/modules/solaris/vmhgfs/sha1.h @@ -24,7 +24,7 @@ #define _SHA1_H_ #define INCLUDE_ALLOW_USERLEVEL -#define INCLUDE_ALLOW_VMMEXT + #define INCLUDE_ALLOW_VMCORE #include "includeCheck.h"