GOS: is it an enum or not

Some time ago the GOS table ID values were changed from defines to
an enum however the "enumity" of the values was not fully plumbed
through the source base. Fix this so we get all of the type checking
and visual goodness.

Did a little bit of grouping/rearranging to the guest ID list to make
it clear that the order can be changed (it's for internal use only).
This will make it more obvious how many of each OS we have and make
searching for things that can be compacted easier.

This is the first of a series of changes to create some room for
more guest OSen - we're limited to 64 as things stand (and they
are all used).

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

diff --git a/open-vm-tools/lib/include/guest_os_tables.h b/open-vm-tools/lib/include/guest_os_tables.h
index 691310f6bb57a2c06fd4f82855bc30ff0becbfc6..904a303f9fb61b7034f06e52c10dcb1915f2d111 100644 (file)
--- a/open-vm-tools/lib/include/guest_os_tables.h
+++ b/open-vm-tools/lib/include/guest_os_tables.h
@@ -41,53 +41,53 @@
    GOT(GUEST_OS_LONGHORN_64)                                  \
    GOT(GUEST_OS_WINVISTA)                                     \
    GOT(GUEST_OS_WINVISTA_64)                                  \
-   GOT(GUEST_OS_UBUNTU)                                       \
+   GOT(GUEST_OS_WINSEVEN)          /* Windows 7 */            \
+   GOT(GUEST_OS_WINSEVEN_64)       /* Windows 7 */            \
+   GOT(GUEST_OS_WIN2008R2)         /* Server 2008 R2 */       \
+   GOT(GUEST_OS_WIN2008R2_64)      /* Server 2008 R2 */       \
+   GOT(GUEST_OS_WINEIGHT)          /* Windows 8 */            \
+   GOT(GUEST_OS_WINEIGHT_64)       /* Windows 8 x64 */        \
+   GOT(GUEST_OS_WINEIGHTSERVER_64) /* Windows 8 Server X64 */ \
+   GOT(GUEST_OS_OS2)                                          \
+   GOT(GUEST_OS_ECOMSTATION)       /* OS/2 variant; 1.x */    \
+   GOT(GUEST_OS_ECOMSTATION2)      /* OS/2 variant; 2.x */    \
    GOT(GUEST_OS_OTHER24XLINUX)                                \
    GOT(GUEST_OS_OTHER24XLINUX_64)                             \
    GOT(GUEST_OS_OTHER26XLINUX)                                \
    GOT(GUEST_OS_OTHER26XLINUX_64)                             \
    GOT(GUEST_OS_OTHERLINUX)                                   \
    GOT(GUEST_OS_OTHERLINUX_64)                                \
-   GOT(GUEST_OS_OS2)                                          \
    GOT(GUEST_OS_OTHER)                                        \
    GOT(GUEST_OS_OTHER_64)                                     \
+   GOT(GUEST_OS_UBUNTU)                                       \
+   GOT(GUEST_OS_DEBIAN45)                                     \
+   GOT(GUEST_OS_DEBIAN45_64)                                  \
+   GOT(GUEST_OS_RHEL6)                                        \
+   GOT(GUEST_OS_RHEL6_64)                                     \
+   GOT(GUEST_OS_RHEL7)                                        \
+   GOT(GUEST_OS_RHEL7_64)                                     \
    GOT(GUEST_OS_FREEBSD)                                      \
    GOT(GUEST_OS_FREEBSD_64)                                   \
-   GOT(GUEST_OS_NETWARE4)                                     \
-   GOT(GUEST_OS_NETWARE5)                                     \
-   GOT(GUEST_OS_NETWARE6)                                     \
    GOT(GUEST_OS_SOLARIS6)                                     \
    GOT(GUEST_OS_SOLARIS7)                                     \
    GOT(GUEST_OS_SOLARIS8)                                     \
    GOT(GUEST_OS_SOLARIS9)                                     \
    GOT(GUEST_OS_SOLARIS10)                                    \
    GOT(GUEST_OS_SOLARIS10_64)                                 \
-   GOT(GUEST_OS_VMKERNEL)          /* ESX 4.x */              \
    GOT(GUEST_OS_DARWIN9)           /* Mac OS 10.5 */          \
    GOT(GUEST_OS_DARWIN9_64)                                   \
    GOT(GUEST_OS_DARWIN10)          /* Mac OS 10.6 */          \
    GOT(GUEST_OS_DARWIN10_64)                                  \
+   GOT(GUEST_OS_DARWIN11)          /* Mac OS 10.7 */          \
+   GOT(GUEST_OS_DARWIN11_64)                                  \
    GOT(GUEST_OS_OPENSERVER5)                                  \
    GOT(GUEST_OS_OPENSERVER6)                                  \
    GOT(GUEST_OS_UNIXWARE7)                                    \
-   GOT(GUEST_OS_DEBIAN45)                                     \
-   GOT(GUEST_OS_DEBIAN45_64)                                  \
-   GOT(GUEST_OS_WINSEVEN)          /* Windows 7 */            \
-   GOT(GUEST_OS_WINSEVEN_64)       /* Windows 7 */            \
-   GOT(GUEST_OS_WIN2008R2)         /* Server 2008 R2 */       \
-   GOT(GUEST_OS_WIN2008R2_64)      /* Server 2008 R2 */       \
-   GOT(GUEST_OS_ECOMSTATION)       /* OS/2 variant; 1.x */    \
-   GOT(GUEST_OS_RHEL6)                                        \
-   GOT(GUEST_OS_RHEL6_64)                                     \
-   GOT(GUEST_OS_WINEIGHT)          /* Windows 8 */            \
-   GOT(GUEST_OS_WINEIGHT_64)       /* Windows 8 x64 */        \
-   GOT(GUEST_OS_WINEIGHTSERVER_64) /* Windows 8 Server X64 */ \
+   GOT(GUEST_OS_NETWARE4)                                     \
+   GOT(GUEST_OS_NETWARE5)                                     \
+   GOT(GUEST_OS_NETWARE6)                                     \
+   GOT(GUEST_OS_VMKERNEL)          /* ESX 4.x */              \
    GOT(GUEST_OS_VMKERNEL5)         /* ESX 5.x and later */    \
-   GOT(GUEST_OS_DARWIN11)          /* Mac OS 10.7 */          \
-   GOT(GUEST_OS_DARWIN11_64)                                  \
-   GOT(GUEST_OS_ECOMSTATION2)      /* OS/2 variant; 2.x */    \
-   GOT(GUEST_OS_RHEL7)                                        \
-   GOT(GUEST_OS_RHEL7_64)                                     \
 
 
 #define GUEST_OS_LIST_GEN                                                   \