GosTable: Server 2008 R2 32-bit never existed

According to Matt Delco Server 2008 R2 32-bit never existed. We can
remove it. This frees up a hosted bit which is good as it gives us
room to play in... until the don't use bits project is done (it's
just getting started).

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 b329c531a44605007eadf5aceb34b35218327d68..8fe901cb7f91444946bc94131cfbdbbfde890b4e 100644 (file)
--- a/open-vm-tools/lib/include/guest_os.h
+++ b/open-vm-tools/lib/include/guest_os.h
@@ -80,9 +80,8 @@ typedef enum GuestOSFamilyType {
 #define ALLWINVISTA64   BS(WINVISTA_64)
 #define ALLWINVISTA     (ALLWINVISTA32 | ALLWINVISTA64)
 
-#define ALLWIN2008R2_32 BS(WIN2008R2)
 #define ALLWIN2008R2_64 BS(WIN2008R2_64)
-#define ALLWIN2008R2    (ALLWIN2008R2_32 | ALLWIN2008R2_64)
+#define ALLWIN2008R2    ALLWIN2008R2_64
 
 #define ALLWINSEVEN32   BS(WINSEVEN)
 #define ALLWINSEVEN64   BS(WINSEVEN_64)
@@ -103,12 +102,11 @@ typedef enum GuestOSFamilyType {
 
 #define ALLWINNT32     (BS(WINNT) | ALLWIN2000 | ALLWINXP32 | ALLWINNET32 | \
                          ALLWINVISTA32 | ALLWINLONGHORN32 | \
-                         ALLWINSEVEN32 | ALLWIN2008R2_32 | \
-                         ALLWINEIGHTCLIENT32)
+                         ALLWINSEVEN32 | ALLWINEIGHTCLIENT32)
 
 #define ALLWINNT64     (ALLWINXP64          | ALLWINNET64 | \
                          ALLWINVISTA64       | ALLWINLONGHORN64 | \
-                         ALLWINSEVEN64       | ALLWIN2008R2_64 | \
+                         ALLWINSEVEN64       | \
                          ALLWINEIGHTCLIENT64 | ALLWINEIGHTSERVER | \
                          ALLHYPER_V)
 
@@ -356,7 +354,6 @@ typedef enum GuestOSFamilyType {
 
 /* Windows Server 2008 R2 (based on Windows 7) */
 
-#define STR_OS_WIN_2008R2     "windows7srv"
 #define STR_OS_WIN_2008R2_X64 "windows7srv-64"
 
 #define STR_OS_WIN_2008R2_FOUNDATION_FULL "Windows Server 2008 R2 Foundation Edition"

diff --git a/open-vm-tools/lib/include/guest_os_tables.h b/open-vm-tools/lib/include/guest_os_tables.h
index bde60d99ab735917af716cd2c2cd347d672c89be..ef08b569792e5946b210450c8e59d4da2b0f55e9 100644 (file)
--- a/open-vm-tools/lib/include/guest_os_tables.h
+++ b/open-vm-tools/lib/include/guest_os_tables.h
@@ -43,7 +43,6 @@
    GOT(GUEST_OS_WINVISTA_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_WINEIGHT)          /* Windows 8 */            \
    GOT(GUEST_OS_WINEIGHT_64)       /* Windows 8 x64 */        \
@@ -140,7 +139,6 @@
    GOSL(STR_OS_WIN_VISTA_X64,                GUEST_OS_WINVISTA_64)          \
    GOSL(STR_OS_WIN_SEVEN,                    GUEST_OS_WINSEVEN)             \
    GOSL(STR_OS_WIN_SEVEN_X64,                GUEST_OS_WINSEVEN_64)          \
-   GOSL(STR_OS_WIN_2008R2,                   GUEST_OS_WIN2008R2)            \
    GOSL(STR_OS_WIN_2008R2_X64,               GUEST_OS_WIN2008R2_64)         \
    GOSL("windows7Server64Guest",             GUEST_OS_WIN2008R2_64)         \
    GOSL(STR_OS_RED_HAT,                      GUEST_OS_OTHER26XLINUX)        \