From: John Wolfe <jwolfe@vmware.com>
Date: Fri, 26 Mar 2021 03:21:18 +0000 (-0700)
Subject: Clean up the classification information for Ubuntu, Debian, and FreeBSD.
X-Git-Tag: stable-11.3.0~94
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=2df1c32e009649602f0f3179272107afa2c966b3;p=thirdparty%2Fopen-vm-tools.git

Clean up the classification information for Ubuntu, Debian, and FreeBSD.

Some important information about these distros was not reflected in
the macros in guest_os.h.  Fixed this.
---

diff --git a/open-vm-tools/lib/include/guest_os.h b/open-vm-tools/lib/include/guest_os.h
index 05e886f0f..b8ede3da7 100644
--- a/open-vm-tools/lib/include/guest_os.h
+++ b/open-vm-tools/lib/include/guest_os.h
@@ -69,10 +69,10 @@ typedef enum GuestOSFamilyType {
    GUEST_OS_FAMILY_DARWIN      = 0x0100
 } GuestOSFamilyType;
 
-#define ALLOS           GUEST_OS_ANY
-#define BS(suf)         GUEST_OS_##suf
-#define GOS_IN_SET(gos, ...)   Gos_InSet(gos, __VA_ARGS__, 0)
-#define GOS_IN_SET_ARRAY(gos, set)   Gos_InSetArray(gos, set)
+#define ALLOS                       GUEST_OS_ANY
+#define BS(suf)                     GUEST_OS_##suf
+#define GOS_IN_SET(gos, ...)        Gos_InSet(gos, __VA_ARGS__, 0)
+#define GOS_IN_SET_ARRAY(gos, set)  Gos_InSetArray(gos, set)
 
 Bool Gos_InSet(uint32 gos, ...);
 Bool Gos_InSetArray(uint32 gos, const uint32 *set);
@@ -88,9 +88,10 @@ Bool Gos_InSetArray(uint32 gos, const uint32 *set);
                               BS(FREEBSD12),  BS(FREEBSD13),  \
                               BS(FREEBSD14)
 
-#define ALLFREEBSD64          BS(FREEBSD_64),   BS(FREEBSD11_64), \
-                              BS(FREEBSD12_64), BS(FREEBSD13_64), \
-                              BS(FREEBSD14_64)
+#define ALLFREEBSD64          BS(FREEBSD_64),   BS(FREEBSD11_64),     \
+                              BS(FREEBSD12_64), BS(FREEBSD13_64),     \
+                              BS(FREEBSD14_64), BS(ARM_FREEBSD13_64), \
+                              BS(ARM_FREEBSD14_64)
 
 #define ALLFREEBSD            ALLFREEBSD32, ALLFREEBSD64
 
@@ -164,8 +165,6 @@ Bool Gos_InSetArray(uint32 gos, const uint32 *set);
 
 #define ALLOTHER              BS(OTHER), BS(OTHER_64)
 
-#define ALLPHOTON             BS(PHOTON_64), BS(ARM_PHOTON_64)
-
 #define ALLSOLARIS11_OR_HIGHER \
                               BS(SOLARIS11_64)
 
@@ -180,6 +179,8 @@ Bool Gos_InSetArray(uint32 gos, const uint32 *set);
 
 #define ALLNETWARE            BS(NETWARE4), BS(NETWARE5), BS(NETWARE6)
 
+#define ALLPHOTON             BS(PHOTON_64), BS(ARM_PHOTON_64)
+
 #define ALL26XLINUX32         BS(DEBIAN),  BS(RHEL),   \
                               BS(UBUNTU),  BS(CENTOS), \
                               BS(ORACLE),  BS(OTHER26XLINUX)
@@ -205,7 +206,8 @@ Bool Gos_InSetArray(uint32 gos, const uint32 *set);
 
 #define ALL5XLINUX32          BS(OTHER5XLINUX)
 
-#define ALL5XLINUX64          BS(OTHER5XLINUX_64), BS(ARM_OTHER5XLINUX_64)
+#define ALL5XLINUX64          BS(OTHER5XLINUX_64), BS(ARM_OTHER5XLINUX_64), \
+                              BS(ARM_DEBIAN_64),   BS(ARM_UBUNTU_64)
 
 #define ALLVMKERNEL           BS(VMKERNEL),   BS(VMKERNEL5), BS(VMKERNEL6), \
                               BS(VMKERNEL65), BS(VMKERNEL7), BS(ARM_VMKERNEL7)
@@ -216,8 +218,9 @@ Bool Gos_InSetArray(uint32 gos, const uint32 *set);
                               ALL5XLINUX32
 
 #define ALLLINUX64            BS(OTHERLINUX_64), BS(OTHER24XLINUX_64), \
-                              ALL26XLINUX64, ALL3XLINUX64, ALL4XLINUX64, \
-                              ALL5XLINUX64
+                              ALL26XLINUX64,     ALL3XLINUX64,         \
+                              ALL4XLINUX64,      ALL5XLINUX64,         \
+                              ALLPHOTON
 
 #define ALLLINUX              ALLLINUX32, ALLLINUX64
 
@@ -245,9 +248,11 @@ Bool Gos_InSetArray(uint32 gos, const uint32 *set);
 
 #define ALLCRX                BS(CRXSYS1_64), BS(CRXPOD1_64)
 
-#define ALLARM                BS(ARM_WINTEN_64), BS(ARM_UBUNTU_64),  \
-                              BS(ARM_PHOTON_64), BS(ARM_VMKERNEL7),  \
-                              BS(ARM_OTHER_64),  BS(ARM_OTHER5XLINUX_64)
+#define ALLARM                BS(ARM_WINTEN_64), BS(ARM_UBUNTU_64),       \
+                              BS(ARM_PHOTON_64), BS(ARM_VMKERNEL7),       \
+                              BS(ARM_OTHER_64),  BS(ARM_OTHER5XLINUX_64), \
+                              BS(ARM_DEBIAN_64)
+
 /*
  * These constants are generated by GuestInfoGetOSName which is in
  * the bora-vmsoft subtree.