From: VMware, Inc <> Date: Mon, 21 May 2012 22:21:13 +0000 (-0700) Subject: GOS: bit shaving X-Git-Tag: 2012.05.21-724730~44 X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=fb8f8ab613c3c62050f526e509ecb2980bfee080;p=thirdparty%2Fopen-vm-tools.git GOS: bit shaving As things stand we can only have 64 unique types of guests for hosted products. We used them all up and need to add more guest OSen. Collapse some less important explicit GOS OSen bits together, adjusting any visible strings accordingly. We have legal agreements with certain parties that require us to show an explicit recognition of their product (e.g. RH) so some things cannot be done away altogether... but we can bit on parties not likely to complain. Since the monitor doesn't need to know about differences, collapse Solaris 6 and 7 together, RHEL 6 and 7 together and SCO OpenServer 5 and 6 together. Total savings 4 bits (50 cents!). More than enough to add the one critical addition and leave room for growth in shipping product until we can implement a system that does away with the 64 guest OSen limitation. Signed-off-by: Dmitry Torokhov --- diff --git a/open-vm-tools/lib/include/guest_os.h b/open-vm-tools/lib/include/guest_os.h index 456bb1aef..f51fcf66b 100644 --- a/open-vm-tools/lib/include/guest_os.h +++ b/open-vm-tools/lib/include/guest_os.h @@ -113,13 +113,13 @@ typedef enum GuestOSFamilyType { #define ALLWIN32 (ALLWIN9X | ALLWINNT32) #define ALLWIN64 ALLWINNT64 #define ALLWIN (ALLWIN32 | ALLWIN64) -#define ALLSOLARIS (BS(SOLARIS6) | BS(SOLARIS7) | BS(SOLARIS8) | \ - BS(SOLARIS9) | BS(SOLARIS10) | BS(SOLARIS10_64)) +#define ALLSOLARIS (BS(SOLARIS_6_AND_7) | BS(SOLARIS8) | BS(SOLARIS9) | \ + BS(SOLARIS10) | BS(SOLARIS10_64)) #define ALLSOLARIS10 (BS(SOLARIS10) | BS(SOLARIS10_64)) #define ALLNETWARE (BS(NETWARE4) | BS(NETWARE5) | BS(NETWARE6)) -#define ALL26XLINUX32 (BS(OTHER26XLINUX) | BS(DEBIAN45) | BS(RHEL6) | \ +#define ALL26XLINUX32 (BS(OTHER26XLINUX) | BS(DEBIAN45) | BS(RHEL) | \ BS(UBUNTU)) -#define ALL26XLINUX64 (BS(OTHER26XLINUX_64) | BS(DEBIAN45_64) | BS(RHEL6_64)) +#define ALL26XLINUX64 (BS(OTHER26XLINUX_64) | BS(DEBIAN45_64) | BS(RHEL_64)) #define ALLVMKERNEL (BS(VMKERNEL) | BS(VMKERNEL5)) diff --git a/open-vm-tools/lib/include/guest_os_tables.h b/open-vm-tools/lib/include/guest_os_tables.h index 904a303f9..487392a56 100644 --- a/open-vm-tools/lib/include/guest_os_tables.h +++ b/open-vm-tools/lib/include/guest_os_tables.h @@ -62,14 +62,11 @@ 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_RHEL) \ + GOT(GUEST_OS_RHEL_64) \ GOT(GUEST_OS_FREEBSD) \ GOT(GUEST_OS_FREEBSD_64) \ - GOT(GUEST_OS_SOLARIS6) \ - GOT(GUEST_OS_SOLARIS7) \ + GOT(GUEST_OS_SOLARIS_6_AND_7) \ GOT(GUEST_OS_SOLARIS8) \ GOT(GUEST_OS_SOLARIS9) \ GOT(GUEST_OS_SOLARIS10) \ @@ -80,8 +77,7 @@ 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_OPENSERVER_5_AND_6) \ GOT(GUEST_OS_UNIXWARE7) \ GOT(GUEST_OS_NETWARE4) \ GOT(GUEST_OS_NETWARE5) \ @@ -153,10 +149,10 @@ GOSL(STR_OS_RED_HAT_EN "4-64", GUEST_OS_OTHER26XLINUX_64) \ GOSL(STR_OS_RED_HAT_EN "5", GUEST_OS_OTHER26XLINUX) \ GOSL(STR_OS_RED_HAT_EN "5-64", GUEST_OS_OTHER26XLINUX_64) \ - GOSL(STR_OS_RED_HAT_EN "6", GUEST_OS_RHEL6) \ - GOSL(STR_OS_RED_HAT_EN "6-64", GUEST_OS_RHEL6_64) \ - GOSL(STR_OS_RED_HAT_EN "7", GUEST_OS_RHEL7) \ - GOSL(STR_OS_RED_HAT_EN "7-64", GUEST_OS_RHEL7_64) \ + GOSL(STR_OS_RED_HAT_EN "6", GUEST_OS_RHEL) \ + GOSL(STR_OS_RED_HAT_EN "6-64", GUEST_OS_RHEL_64) \ + GOSL(STR_OS_RED_HAT_EN "7", GUEST_OS_RHEL) \ + GOSL(STR_OS_RED_HAT_EN "7-64", GUEST_OS_RHEL_64) \ GOSL(STR_OS_CENTOS, GUEST_OS_OTHER26XLINUX) \ GOSL(STR_OS_CENTOS "-64", GUEST_OS_OTHER26XLINUX_64) \ GOSL(STR_OS_ORACLE, GUEST_OS_OTHER26XLINUX) \ @@ -197,8 +193,8 @@ GOSL(STR_OS_DEBIAN_5 "-64", GUEST_OS_DEBIAN45_64) \ GOSL(STR_OS_DEBIAN_6, GUEST_OS_DEBIAN45) \ GOSL(STR_OS_DEBIAN_6 "-64", GUEST_OS_DEBIAN45_64) \ - GOSL(STR_OS_SOLARIS "6", GUEST_OS_SOLARIS6) \ - GOSL(STR_OS_SOLARIS "7", GUEST_OS_SOLARIS7) \ + GOSL(STR_OS_SOLARIS "6", GUEST_OS_SOLARIS_6_AND_7) \ + GOSL(STR_OS_SOLARIS "7", GUEST_OS_SOLARIS_6_AND_7) \ GOSL(STR_OS_SOLARIS "8", GUEST_OS_SOLARIS8) \ GOSL(STR_OS_SOLARIS "9", GUEST_OS_SOLARIS9) \ GOSL(STR_OS_SOLARIS "10", GUEST_OS_SOLARIS10) \ @@ -228,8 +224,8 @@ GOSL("other-64", GUEST_OS_OTHER_64) \ GOSL("vmkernel", GUEST_OS_VMKERNEL) \ GOSL("vmkernel5", GUEST_OS_VMKERNEL5) \ - GOSL("openserver5", GUEST_OS_OPENSERVER5) \ - GOSL("openserver6", GUEST_OS_OPENSERVER6) \ + GOSL("openserver5", GUEST_OS_OPENSERVER_5_AND_6) \ + GOSL("openserver6", GUEST_OS_OPENSERVER_5_AND_6) \ GOSL("unixware7", GUEST_OS_UNIXWARE7) \ GOSL(STR_OS_ECOMSTATION, GUEST_OS_ECOMSTATION) \ GOSL(STR_OS_ECOMSTATION "2", GUEST_OS_ECOMSTATION2) \