GOSTable: New Mac hardware, new GOSTable bit

We need a new GOSTable bit for darwin12 to cover the new bridge and CPU
architecture... we need to provide monitor specific settings appropriate
to the OS.

DARWIN12 will be 64-bit only so we can drop a 32-bit entry.

Clean up any fallout.

Once the monitor settings have been finalized a follow up change will
deal with monitor settings.

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

diff --git a/open-vm-tools/lib/include/guest_os.h b/open-vm-tools/lib/include/guest_os.h
index ffced6dad96a3b4189cb558ac62fdf6fd51bb875..c202ae101df83e5d927914e06cdadfd0ab74b220 100644 (file)
--- a/open-vm-tools/lib/include/guest_os.h
+++ b/open-vm-tools/lib/include/guest_os.h
@@ -52,7 +52,8 @@ typedef enum GuestOSFamilyType {
    GUEST_OS_FAMILY_WIN2000     = 0x0010,
    GUEST_OS_FAMILY_WINXP       = 0x0020,
    GUEST_OS_FAMILY_WINNET      = 0x0040,
-   GUEST_OS_FAMILY_NETWARE     = 0x0080
+   GUEST_OS_FAMILY_NETWARE     = 0x0080,
+   GUEST_OS_FAMILY_DARWIN      = 0x0100
 } GuestOSFamilyType;
 
 #define ALLOS           (~CONST64U(0))
@@ -131,8 +132,9 @@ typedef enum GuestOSFamilyType {
 #define ALLLINUX64      (BS(OTHER24XLINUX_64) | ALL26XLINUX64 | \
                          BS(OTHERLINUX_64))
 #define ALLLINUX        (ALLLINUX32 | ALLLINUX64)
-#define ALLDARWIN32     (BS(DARWIN9) | BS(DARWIN10) | BS(DARWIN11))
-#define ALLDARWIN64     (BS(DARWIN9_64) | BS(DARWIN10_64) | BS(DARWIN11_64))
+#define ALLDARWIN32     (BS(DARWIN9)  | BS(DARWIN10) | BS(DARWIN11))
+#define ALLDARWIN64     (BS(DARWIN9_64)  | BS(DARWIN10_64) | \
+                         BS(DARWIN11_64) | BS(DARWIN12_64))
 #define ALLDARWIN       (ALLDARWIN32 | ALLDARWIN64)
 #define ALL64           (ALLWIN64 | ALLLINUX64 | \
                          BS(SOLARIS10_64) | BS(FREEBSD_64) | \

diff --git a/open-vm-tools/lib/include/guest_os_tables.h b/open-vm-tools/lib/include/guest_os_tables.h
index 89ed57914c34f6916a4bffab79111b15369f0ad8..7fae2c1fbd318f762e814ba0dc1a1a917915ca76 100644 (file)
--- a/open-vm-tools/lib/include/guest_os_tables.h
+++ b/open-vm-tools/lib/include/guest_os_tables.h
@@ -78,6 +78,7 @@
    GOT(GUEST_OS_DARWIN10_64)                                  \
    GOT(GUEST_OS_DARWIN11)          /* Mac OS 10.7 */          \
    GOT(GUEST_OS_DARWIN11_64)                                  \
+   GOT(GUEST_OS_DARWIN12_64)       /* Mac OS 10.8 */          \
    GOT(GUEST_OS_OPENSERVER_5_AND_6)                           \
    GOT(GUEST_OS_UNIXWARE7)                                    \
    GOT(GUEST_OS_NETWARE4)                                     \
@@ -131,7 +132,7 @@
    GOSL(STR_OS_WIN_2008_ENTERPRISE_CORE_X64, GUEST_OS_LONGHORN_64)          \
    GOSL(STR_OS_WIN_2008_SMALL_BUSINESS_X64,  GUEST_OS_LONGHORN_64)          \
    GOSL(STR_OS_WIN_2008_SMALL_BUSINESS_PREMIUM_X64, GUEST_OS_LONGHORN_64)   \
-   GOSL(STR_OS_WIN_2008_STANDARD_X64,    GUEST_OS_LONGHORN_64)              \
+   GOSL(STR_OS_WIN_2008_STANDARD_X64,        GUEST_OS_LONGHORN_64)          \
    GOSL(STR_OS_WIN_2008_STANDARD_CORE_X64,   GUEST_OS_LONGHORN_64)          \
    GOSL(STR_OS_WIN_2008_WEB_SERVER_X64,      GUEST_OS_LONGHORN_64)          \
    GOSL("winLonghorn64Guest",                GUEST_OS_LONGHORN_64)          \
@@ -219,8 +220,7 @@
    GOSL(STR_OS_MACOS "10-64",                GUEST_OS_DARWIN10_64)          \
    GOSL(STR_OS_MACOS "11",                   GUEST_OS_DARWIN11)             \
    GOSL(STR_OS_MACOS "11-64",                GUEST_OS_DARWIN11_64)          \
-   GOSL(STR_OS_MACOS "12",                   GUEST_OS_DARWIN11)             \
-   GOSL(STR_OS_MACOS "12-64",                GUEST_OS_DARWIN11_64)          \
+   GOSL(STR_OS_MACOS "12-64",                GUEST_OS_DARWIN12_64)          \
    GOSL("other",                             GUEST_OS_OTHER)                \
    GOSL("other-64",                          GUEST_OS_OTHER_64)             \
    GOSL("vmkernel",                          GUEST_OS_VMKERNEL)             \