From: Oliver Kurth Date: Wed, 29 Aug 2018 20:29:45 +0000 (-0700) Subject: Back out the previous change to a common header file. X-Git-Tag: stable-11.0.0~434 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=ba0fb39c6f636092079040fa35ef96a44c107b73;p=thirdparty%2Fopen-vm-tools.git Back out the previous change to a common header file. --- diff --git a/open-vm-tools/lib/include/guest_os_tables.h b/open-vm-tools/lib/include/guest_os_tables.h index 253f65b42..b6e9efb53 100644 --- a/open-vm-tools/lib/include/guest_os_tables.h +++ b/open-vm-tools/lib/include/guest_os_tables.h @@ -130,6 +130,203 @@ extern "C" { GOT(GUEST_OS_CRXPOD1_64) /* VMware CRX pod VM 1.0 64-bit */ +/* This list must be sorted alphabetically (non-case-sensitive) by gos name. */ +#define GUEST_OS_LIST_GEN \ + GOSL(STR_OS_AMAZON_LINUX "2-64", GUEST_OS_AMAZONLINUX2_64, NULL) \ + GOSL(STR_OS_ASIANUX "3", GUEST_OS_OTHER26XLINUX, "linuxPreGlibc25.iso") \ + GOSL(STR_OS_ASIANUX "3-64", GUEST_OS_OTHER26XLINUX_64, "linuxPreGlibc25.iso") \ + GOSL(STR_OS_ASIANUX "4", GUEST_OS_OTHER26XLINUX, "linuxPreGlibc25.iso") \ + GOSL(STR_OS_ASIANUX "4-64", GUEST_OS_OTHER26XLINUX_64, "linuxPreGlibc25.iso") \ + GOSL(STR_OS_ASIANUX "5-64", GUEST_OS_OTHER3XLINUX_64, "linux.iso") \ + GOSL(STR_OS_ASIANUX "7-64", GUEST_OS_OTHER3XLINUX_64, "linux.iso") \ + GOSL(STR_OS_ASIANUX "8-64", GUEST_OS_OTHER3XLINUX_64, "linux.iso") \ + GOSL(STR_OS_CENTOS, GUEST_OS_CENTOS, "linux.iso") \ + GOSL(STR_OS_CENTOS "-64", GUEST_OS_CENTOS_64, "linux.iso") \ + GOSL(STR_OS_CENTOS "6", GUEST_OS_CENTOS6, "linux.iso") \ + GOSL(STR_OS_CENTOS "6-64", GUEST_OS_CENTOS6_64, "linux.iso") \ + GOSL(STR_OS_CENTOS "7-64", GUEST_OS_CENTOS7_64, "linux.iso") \ + GOSL(STR_OS_CENTOS "8-64", GUEST_OS_CENTOS8_64, "linux.iso") \ + GOSL("coreos-64", GUEST_OS_OTHER3XLINUX_64, NULL) \ + GOSL(STR_OS_CRXPOD "1-64", GUEST_OS_CRXPOD1_64, NULL) \ + GOSL(STR_OS_CRXSYS "1-64", GUEST_OS_CRXSYS1_64, NULL) \ + GOSL(STR_OS_MACOS, GUEST_OS_DARWIN9, "darwinPre15.iso") \ + GOSL(STR_OS_MACOS "-64", GUEST_OS_DARWIN9_64, "darwinPre15.iso") \ + GOSL(STR_OS_MACOS "10", GUEST_OS_DARWIN10, "darwinPre15.iso") \ + GOSL(STR_OS_MACOS "10-64", GUEST_OS_DARWIN10_64, "darwinPre15.iso") \ + GOSL(STR_OS_MACOS "11", GUEST_OS_DARWIN11, "darwinPre15.iso") \ + GOSL(STR_OS_MACOS "11-64", GUEST_OS_DARWIN11_64, "darwinPre15.iso") \ + GOSL(STR_OS_MACOS "12-64", GUEST_OS_DARWIN12_64, "darwinPre15.iso") \ + GOSL(STR_OS_MACOS "13-64", GUEST_OS_DARWIN13_64, "darwinPre15.iso") \ + GOSL(STR_OS_MACOS "14-64", GUEST_OS_DARWIN14_64, "darwinPre15.iso") \ + GOSL(STR_OS_MACOS "15-64", GUEST_OS_DARWIN15_64, "darwin.iso") \ + GOSL(STR_OS_MACOS "16-64", GUEST_OS_DARWIN16_64, "darwin.iso") \ + GOSL(STR_OS_MACOS "17-64", GUEST_OS_DARWIN17_64, "darwin.iso") \ + GOSL(STR_OS_MACOS "18-64", GUEST_OS_DARWIN18_64, "darwin.iso") \ + GOSL(STR_OS_MACOS "19-64", GUEST_OS_DARWIN19_64, "darwin.iso") \ + GOSL(STR_OS_DEBIAN_10, GUEST_OS_DEBIAN, "linux.iso") \ + GOSL(STR_OS_DEBIAN_10 "-64", GUEST_OS_DEBIAN_64, "linux.iso") \ + GOSL(STR_OS_DEBIAN_4, GUEST_OS_DEBIAN, "linuxPreGlibc25.iso") \ + GOSL(STR_OS_DEBIAN_4 "-64", GUEST_OS_DEBIAN_64, "linuxPreGlibc25.iso") \ + GOSL(STR_OS_DEBIAN_5, GUEST_OS_DEBIAN, "linuxPreGlibc25.iso") \ + GOSL(STR_OS_DEBIAN_5 "-64", GUEST_OS_DEBIAN_64, "linuxPreGlibc25.iso") \ + GOSL(STR_OS_DEBIAN_6, GUEST_OS_DEBIAN, "linux.iso") \ + GOSL(STR_OS_DEBIAN_6 "-64", GUEST_OS_DEBIAN_64, "linux.iso") \ + GOSL(STR_OS_DEBIAN_7, GUEST_OS_DEBIAN, "linux.iso") \ + GOSL(STR_OS_DEBIAN_7 "-64", GUEST_OS_DEBIAN_64, "linux.iso") \ + GOSL(STR_OS_DEBIAN_8, GUEST_OS_DEBIAN, "linux.iso") \ + GOSL(STR_OS_DEBIAN_8 "-64", GUEST_OS_DEBIAN_64, "linux.iso") \ + GOSL(STR_OS_DEBIAN_9, GUEST_OS_DEBIAN, "linux.iso") \ + GOSL(STR_OS_DEBIAN_9 "-64", GUEST_OS_DEBIAN_64, "linux.iso") \ + GOSL("dos", GUEST_OS_DOS, NULL) \ + GOSL(STR_OS_ECOMSTATION, GUEST_OS_ECOMSTATION, NULL) \ + GOSL(STR_OS_ECOMSTATION "2", GUEST_OS_ECOMSTATION2, NULL) \ + GOSL("fedora", GUEST_OS_OTHER26XLINUX, "linux.iso") \ + GOSL("fedora-64", GUEST_OS_OTHER26XLINUX_64, "linux.iso") \ + GOSL(STR_OS_FREEBSD, GUEST_OS_FREEBSD, "freebsd.iso") \ + GOSL(STR_OS_FREEBSD "-64", GUEST_OS_FREEBSD_64, "freebsd.iso") \ + GOSL(STR_OS_FREEBSD "11", GUEST_OS_FREEBSD11, "freebsd.iso") \ + GOSL(STR_OS_FREEBSD "11-64", GUEST_OS_FREEBSD11_64, "freebsd.iso") \ + GOSL(STR_OS_FREEBSD "12", GUEST_OS_FREEBSD12, "freebsd.iso") \ + GOSL(STR_OS_FREEBSD "12-64", GUEST_OS_FREEBSD12_64, "freebsd.iso") \ + GOSL("linux", GUEST_OS_OTHERLINUX, "linuxPreGlibc25.iso") /* old */ \ + GOSL(STR_OS_WIN_LONG, GUEST_OS_LONGHORN, "windows.iso") \ + GOSL("longhorn-64", GUEST_OS_LONGHORN_64, "windows.iso") \ + GOSL(STR_OS_MANDRAKE, GUEST_OS_OTHER26XLINUX, "linuxPreGlibc25.iso") \ + GOSL(STR_OS_MANDRAKE "-64", GUEST_OS_OTHER26XLINUX_64, "linuxPreGlibc25.iso") \ + GOSL(STR_OS_MANDRIVA, GUEST_OS_OTHER26XLINUX, "linuxPreGlibc25.iso") \ + GOSL(STR_OS_MANDRIVA "-64", GUEST_OS_OTHER26XLINUX_64, "linuxPreGlibc25.iso") \ + GOSL("netware4", GUEST_OS_NETWARE4, "netware.iso") \ + GOSL("netware5", GUEST_OS_NETWARE5, "netware.iso") \ + GOSL("netware6", GUEST_OS_NETWARE6, "netware.iso") \ + GOSL(STR_OS_NOVELL, GUEST_OS_OTHER26XLINUX, "linuxPreGlibc25.iso") \ + GOSL("nt4", GUEST_OS_WINNT, "winPre2k.iso") /* old */ \ + GOSL("oes", GUEST_OS_OTHER26XLINUX, "linuxPreGlibc25.iso") \ + GOSL("openserver5", GUEST_OS_OPENSERVER_5_AND_6, NULL) \ + GOSL("openserver6", GUEST_OS_OPENSERVER_5_AND_6, NULL) \ + GOSL(STR_OS_OPENSUSE, GUEST_OS_OTHER26XLINUX, "linux.iso") \ + GOSL(STR_OS_OPENSUSE "-64", GUEST_OS_OTHER26XLINUX_64, "linux.iso") \ + GOSL(STR_OS_ORACLE, GUEST_OS_ORACLE, "linux.iso") \ + GOSL(STR_OS_ORACLE "-64", GUEST_OS_ORACLE_64, "linux.iso") \ + GOSL(STR_OS_ORACLE "6", GUEST_OS_ORACLE6, "linux.iso") \ + GOSL(STR_OS_ORACLE "6-64", GUEST_OS_ORACLE6_64, "linux.iso") \ + GOSL(STR_OS_ORACLE "7-64", GUEST_OS_ORACLE7_64, "linux.iso") \ + GOSL(STR_OS_ORACLE "8-64", GUEST_OS_ORACLE8_64, "linux.iso") \ + GOSL("os2", GUEST_OS_OS2, NULL) \ + GOSL("os2experimental", GUEST_OS_OS2, NULL) \ + GOSL("other", GUEST_OS_OTHER, NULL) \ + GOSL("other-64", GUEST_OS_OTHER_64, NULL) \ + GOSL(STR_OS_OTHER_24, GUEST_OS_OTHER24XLINUX, "linuxPreGlibc25.iso") \ + GOSL(STR_OS_OTHER_24 "-64", GUEST_OS_OTHER24XLINUX_64, "linuxPreGlibc25.iso") \ + GOSL(STR_OS_OTHER_26, GUEST_OS_OTHER26XLINUX, "linux.iso") \ + GOSL(STR_OS_OTHER_26 "-64", GUEST_OS_OTHER26XLINUX_64, "linux.iso") \ + GOSL(STR_OS_OTHER_3X, GUEST_OS_OTHER3XLINUX, "linux.iso") \ + GOSL(STR_OS_OTHER_3X "-64", GUEST_OS_OTHER3XLINUX_64, "linux.iso") \ + GOSL(STR_OS_OTHER_4X, GUEST_OS_OTHER4XLINUX, "linux.iso") \ + GOSL(STR_OS_OTHER_4X "-64", GUEST_OS_OTHER4XLINUX_64, "linux.iso") \ + GOSL(STR_OS_OTHER, GUEST_OS_OTHERLINUX, "linuxPreGlibc25.iso") \ + GOSL(STR_OS_OTHER "-64", GUEST_OS_OTHERLINUX_64, "linuxPreGlibc25.iso") \ + GOSL(STR_OS_RED_HAT, GUEST_OS_OTHER26XLINUX, "linuxPreGlibc25.iso") \ + GOSL(STR_OS_RED_HAT_EN "2", GUEST_OS_OTHER24XLINUX, "linuxPreGlibc25.iso") \ + GOSL(STR_OS_RED_HAT_EN "3", GUEST_OS_OTHER24XLINUX, "linuxPreGlibc25.iso") \ + GOSL(STR_OS_RED_HAT_EN "3-64", GUEST_OS_OTHER24XLINUX_64, "linuxPreGlibc25.iso") \ + GOSL(STR_OS_RED_HAT_EN "4", GUEST_OS_OTHER26XLINUX, "linuxPreGlibc25.iso") \ + GOSL(STR_OS_RED_HAT_EN "4-64", GUEST_OS_OTHER26XLINUX_64, "linuxPreGlibc25.iso") \ + GOSL(STR_OS_RED_HAT_EN "5", GUEST_OS_OTHER26XLINUX, "linux.iso") \ + GOSL(STR_OS_RED_HAT_EN "5-64", GUEST_OS_OTHER26XLINUX_64, "linux.iso") \ + GOSL(STR_OS_RED_HAT_EN "6", GUEST_OS_RHEL, "linux.iso") \ + GOSL(STR_OS_RED_HAT_EN "6-64", GUEST_OS_RHEL_64, "linux.iso") \ + GOSL(STR_OS_RED_HAT_EN "7", GUEST_OS_RHEL, "linux.iso") \ + GOSL(STR_OS_RED_HAT_EN "7-64", GUEST_OS_RHEL_64, "linux.iso") \ + GOSL(STR_OS_RED_HAT_EN "8-64", GUEST_OS_RHEL_64, "linux.iso") \ + GOSL(STR_OS_SUN_DESK, GUEST_OS_OTHER24XLINUX, "linuxPreGlibc25.iso") \ + GOSL(STR_OS_SLES, GUEST_OS_OTHER26XLINUX, "linuxPreGlibc25.iso") \ + GOSL(STR_OS_SLES "-64", GUEST_OS_OTHER26XLINUX_64, "linuxPreGlibc25.iso") \ + GOSL(STR_OS_SLES "10", GUEST_OS_OTHER26XLINUX, "linuxPreGlibc25.iso") \ + GOSL(STR_OS_SLES "10-64", GUEST_OS_OTHER26XLINUX_64, "linuxPreGlibc25.iso") \ + GOSL(STR_OS_SLES "11", GUEST_OS_OTHER26XLINUX, "linux.iso") \ + GOSL(STR_OS_SLES "11-64", GUEST_OS_OTHER26XLINUX_64, "linux.iso") \ + GOSL(STR_OS_SLES "12", GUEST_OS_OTHER26XLINUX, "linux.iso") \ + GOSL(STR_OS_SLES "12-64", GUEST_OS_OTHER26XLINUX_64, "linux.iso") \ + GOSL(STR_OS_SLES "15-64", GUEST_OS_OTHER3XLINUX_64, "linux.iso") \ + GOSL(STR_OS_SOLARIS "10", GUEST_OS_SOLARIS10, "solaris.iso") \ + GOSL(STR_OS_SOLARIS "10-64", GUEST_OS_SOLARIS10_64, "solaris.iso") \ + GOSL(STR_OS_SOLARIS "11-64", GUEST_OS_SOLARIS11_64, "solaris.iso") \ + GOSL(STR_OS_SOLARIS "6", GUEST_OS_SOLARIS_6_AND_7, "solaris.iso") \ + GOSL(STR_OS_SOLARIS "7", GUEST_OS_SOLARIS_6_AND_7, "solaris.iso") \ + GOSL(STR_OS_SOLARIS "8", GUEST_OS_SOLARIS8, "solaris.iso") \ + GOSL(STR_OS_SOLARIS "9", GUEST_OS_SOLARIS9, "solaris.iso") \ + GOSL(STR_OS_SUSE, GUEST_OS_OTHER26XLINUX, "linuxPreGlibc25.iso") \ + GOSL(STR_OS_SUSE "-64", GUEST_OS_OTHER26XLINUX_64, "linuxPreGlibc25.iso") \ + GOSL(STR_OS_TURBO, GUEST_OS_OTHER26XLINUX, "linuxPreGlibc25.iso") \ + GOSL(STR_OS_TURBO "-64", GUEST_OS_OTHER26XLINUX_64, "linuxPreGlibc25.iso") \ + GOSL(STR_OS_UBUNTU, GUEST_OS_UBUNTU, "linux.iso") \ + GOSL(STR_OS_UBUNTU "-64", GUEST_OS_OTHER26XLINUX_64, "linux.iso") \ + GOSL("unixware7", GUEST_OS_UNIXWARE7, NULL) \ + GOSL(STR_OS_VMKERNEL, GUEST_OS_VMKERNEL, NULL) \ + GOSL(STR_OS_VMKERNEL "5", GUEST_OS_VMKERNEL5, NULL) \ + GOSL(STR_OS_VMKERNEL "6", GUEST_OS_VMKERNEL6, NULL) \ + GOSL(STR_OS_VMKERNEL "65", GUEST_OS_VMKERNEL65, NULL) \ + GOSL(STR_OS_VMKERNEL "7", GUEST_OS_VMKERNEL7, NULL) \ + GOSL(STR_OS_PHOTON "-64", GUEST_OS_PHOTON_64, NULL) \ + GOSL("whistler", GUEST_OS_WINXP, "winPreVista.iso") /* old */ \ + GOSL("win2000", GUEST_OS_WIN2000, "winPreVista.iso") /* old */ \ + GOSL(STR_OS_WIN_2000_ADV_SERV, GUEST_OS_WIN2000, "winPreVista.iso") \ + GOSL(STR_OS_WIN_2000_PRO, GUEST_OS_WIN2000, "winPreVista.iso") \ + GOSL(STR_OS_WIN_2000_SERV, GUEST_OS_WIN2000, "winPreVista.iso") \ + GOSL(STR_OS_WIN_31, GUEST_OS_WIN31, "winPre2k.iso") \ + GOSL(STR_OS_WIN_95, GUEST_OS_WIN95, "winPre2k.iso") \ + GOSL(STR_OS_WIN_98, GUEST_OS_WIN98, "winPre2k.iso") \ + GOSL(STR_OS_WIN_2019SRV_X64, GUEST_OS_WIN_2019SRV_64, "windows.iso") \ + GOSL(STR_OS_WIN_SEVEN, GUEST_OS_WINSEVEN, "windows.iso") \ + GOSL(STR_OS_WIN_SEVEN_X64, GUEST_OS_WINSEVEN_64, "windows.iso") \ + GOSL("windows7Server64Guest", GUEST_OS_WIN2008R2_64, "windows.iso") \ + GOSL(STR_OS_WIN_2008R2_X64, GUEST_OS_WIN2008R2_64, "windows.iso") \ + GOSL(STR_OS_WIN_EIGHT, GUEST_OS_WINEIGHT, "windows.iso") \ + GOSL(STR_OS_WIN_EIGHT_X64, GUEST_OS_WINEIGHT_64, "windows.iso") \ + GOSL(STR_OS_WIN_EIGHTSERVER_X64, GUEST_OS_WINEIGHTSERVER_64, "windows.iso") \ + GOSL(STR_OS_WIN_TEN, GUEST_OS_WINTEN, "windows.iso") \ + GOSL(STR_OS_WIN_TEN_X64, GUEST_OS_WINTEN_64, "windows.iso") \ + GOSL(STR_OS_WIN_2016SRV_X64, GUEST_OS_WIN_2016SRV_64, "windows.iso") \ + GOSL(STR_OS_HYPER_V, GUEST_OS_HYPER_V, NULL) \ + GOSL("winLonghorn64Guest", GUEST_OS_LONGHORN_64, "windows.iso") \ + GOSL("winLonghornGuest", GUEST_OS_LONGHORN, "windows.iso") \ + GOSL(STR_OS_WIN_ME, GUEST_OS_WINME, "winPre2k.iso") \ + GOSL(STR_OS_WIN_NET_BUS, GUEST_OS_WINNET, "winPreVista.iso") \ + GOSL("winNetDatacenter", GUEST_OS_WINNET, "winPreVista.iso") \ + GOSL("winNetDatacenter-64", GUEST_OS_WINNET_64, "winPreVista.iso") \ + GOSL(STR_OS_WIN_NET_EN, GUEST_OS_WINNET, "winPreVista.iso") \ + GOSL("winNetEnterprise-64", GUEST_OS_WINNET_64, "winPreVista.iso") \ + GOSL(STR_OS_WIN_NET_ST, GUEST_OS_WINNET, "winPreVista.iso") \ + GOSL("winNetStandard-64", GUEST_OS_WINNET_64, "winPreVista.iso") \ + GOSL(STR_OS_WIN_NET_WEB, GUEST_OS_WINNET, "winPreVista.iso") \ + GOSL(STR_OS_WIN_NT, GUEST_OS_WINNT, "winPre2k.iso") \ + GOSL(STR_OS_WIN_2008_CLUSTER, GUEST_OS_LONGHORN, "windows.iso") \ + GOSL(STR_OS_WIN_2008_CLUSTER_X64, GUEST_OS_LONGHORN_64, "windows.iso") \ + GOSL(STR_OS_WIN_2008_DATACENTER, GUEST_OS_LONGHORN, "windows.iso") \ + GOSL(STR_OS_WIN_2008_DATACENTER_X64, GUEST_OS_LONGHORN_64, "windows.iso") \ + GOSL(STR_OS_WIN_2008_DATACENTER_CORE, GUEST_OS_LONGHORN, "windows.iso") \ + GOSL(STR_OS_WIN_2008_DATACENTER_CORE_X64, GUEST_OS_LONGHORN_64, "windows.iso") \ + GOSL(STR_OS_WIN_2008_ENTERPRISE, GUEST_OS_LONGHORN, "windows.iso") \ + GOSL(STR_OS_WIN_2008_ENTERPRISE_X64, GUEST_OS_LONGHORN_64, "windows.iso") \ + GOSL(STR_OS_WIN_2008_ENTERPRISE_CORE, GUEST_OS_LONGHORN, "windows.iso") \ + GOSL(STR_OS_WIN_2008_ENTERPRISE_CORE_X64, GUEST_OS_LONGHORN_64, "windows.iso") \ + GOSL(STR_OS_WIN_2008_SMALL_BUSINESS, GUEST_OS_LONGHORN, "windows.iso") \ + GOSL(STR_OS_WIN_2008_SMALL_BUSINESS_X64, GUEST_OS_LONGHORN_64, "windows.iso") \ + GOSL(STR_OS_WIN_2008_SMALL_BUSINESS_PREMIUM, GUEST_OS_LONGHORN, "windows.iso") \ + GOSL(STR_OS_WIN_2008_SMALL_BUSINESS_PREMIUM_X64, GUEST_OS_LONGHORN_64, "windows.iso") \ + GOSL(STR_OS_WIN_2008_STANDARD, GUEST_OS_LONGHORN, "windows.iso") \ + GOSL(STR_OS_WIN_2008_STANDARD_X64, GUEST_OS_LONGHORN_64, "windows.iso") \ + GOSL(STR_OS_WIN_2008_STANDARD_CORE, GUEST_OS_LONGHORN, "windows.iso") \ + GOSL(STR_OS_WIN_2008_STANDARD_CORE_X64, GUEST_OS_LONGHORN_64, "windows.iso") \ + GOSL(STR_OS_WIN_2008_WEB_SERVER, GUEST_OS_LONGHORN, "windows.iso") \ + GOSL(STR_OS_WIN_2008_WEB_SERVER_X64, GUEST_OS_LONGHORN_64, "windows.iso") \ + GOSL(STR_OS_WIN_VISTA, GUEST_OS_WINVISTA, "windows.iso") \ + GOSL(STR_OS_WIN_VISTA_X64, GUEST_OS_WINVISTA_64, "windows.iso") \ + GOSL(STR_OS_WIN_XP_HOME, GUEST_OS_WINXP, "winPreVista.iso") \ + GOSL(STR_OS_WIN_XP_PRO, GUEST_OS_WINXP, "winPreVista.iso") \ + GOSL(STR_OS_WIN_XP_PRO_X64, GUEST_OS_WINXPPRO_64, "winPreVista.iso") \ + + /* * Mappings between VIM guest OS keys and the rest of the civilized world. *