From: Oliver Kurth <okurth@vmware.com>
Date: Tue, 5 Jun 2018 22:47:39 +0000 (-0700)
Subject: vm_basic_types.h: remove VM_I386
X-Git-Tag: stable-11.0.0~547
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=bc241e19875862306fc66e42ec50faa20312ccf2;p=thirdparty%2Fopen-vm-tools.git

vm_basic_types.h: remove VM_I386

The VM_I386 macro is described as "historical". But recent cleanups
reduced the number of usages to the point where "historical" can become
"removed".

Remove the declaration, comments describing the declaration, and
fix the last two places to use the modern macro alternatives.
---

diff --git a/open-vm-tools/lib/include/backdoor_types.h b/open-vm-tools/lib/include/backdoor_types.h
index 2a9783af2..d506c3146 100644
--- a/open-vm-tools/lib/include/backdoor_types.h
+++ b/open-vm-tools/lib/include/backdoor_types.h
@@ -39,7 +39,8 @@
 #ifndef _BACKDOOR_TYPES_H_
 #define _BACKDOOR_TYPES_H_
 
-#ifndef VM_I386
+#if !defined(__i386__) && !defined(__x86_64__) && \
+    !defined(_M_IX86) && !defined(_M_X64)
 #error The backdoor protocol is only supported on x86 architectures.
 #endif
 
diff --git a/open-vm-tools/lib/include/vm_basic_defs.h b/open-vm-tools/lib/include/vm_basic_defs.h
index a74d36311..5d9afaa37 100644
--- a/open-vm-tools/lib/include/vm_basic_defs.h
+++ b/open-vm-tools/lib/include/vm_basic_defs.h
@@ -248,7 +248,7 @@ Max(int a, int b)
  */
 
 #ifndef PAGE_SHIFT // {
-#if defined VM_I386
+#if defined __x86_64__ || defined __i386__
    #define PAGE_SHIFT    12
 #elif defined __APPLE__
    #define PAGE_SHIFT    12
diff --git a/open-vm-tools/lib/include/vm_basic_types.h b/open-vm-tools/lib/include/vm_basic_types.h
index 91624d577..78d39113b 100644
--- a/open-vm-tools/lib/include/vm_basic_types.h
+++ b/open-vm-tools/lib/include/vm_basic_types.h
@@ -102,18 +102,9 @@
  * - VM_<arch>_32 for the 32-bit variant.
  * - VM_<arch>_64 for the 64-bit variant.
  * - VM_<arch>_ANY for any variant of <arch>.
- *
- * VM_X86_ANY is synonymous with the confusing and deprecated VM_I386 (which
- * should really be VM_X86_32).
  */
 
 #ifdef __i386__
-/*
- * VM_I386 is historically synonymous with VM_X86_ANY in bora, but misleading,
- * since it is confused with the __i386__ gcc but defined for both 32- and
- * 64-bit x86. We retain it here for legacy compatibility.
- */
-#define VM_I386
 #define VM_X86_32
 #define VM_X86_ANY
 #define VM_32BIT
@@ -122,7 +113,6 @@
 #ifdef __x86_64__
 #define VM_X86_64
 #define vm_x86_64 1
-#define VM_I386
 #define VM_X86_ANY
 #define VM_64BIT
 #else