From: Oliver Kurth <okurth@vmware.com>
Date: Mon, 20 Aug 2018 19:48:07 +0000 (-0700)
Subject: Changes to common source files; not directly applicable to open-vm-tools
X-Git-Tag: stable-11.0.0~473
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=e70640b985d31612ad63506eb3dd838b8bbded14;p=thirdparty%2Fopen-vm-tools.git

Changes to common source files; not directly applicable to open-vm-tools

Add support for CRX pod and sys (version 1) VMs

These are special Linux 4 VMs; the CRX pod VMs are wrapped around
Kubernetes. Here we provide the basic VMX recognition and support
mechanisms. Later changes will add the support of the CRX pod VMs
to VIM/VMODL... and other pieces.
---

diff --git a/open-vm-tools/lib/include/guest_os.h b/open-vm-tools/lib/include/guest_os.h
index 9cd1e85c1..e9dd33e02 100644
--- a/open-vm-tools/lib/include/guest_os.h
+++ b/open-vm-tools/lib/include/guest_os.h
@@ -187,6 +187,7 @@ Bool Gos_InSetArray(uint32 gos, const uint32 *set);
 
 #define ALL4XLINUX64          BS(OTHER4XLINUX_64), BS(PHOTON_64), \
                               BS(CENTOS8_64), BS(ORACLE8_64), \
+                              BS(CRXSYS1_64), BS(CRXPOD1_64), \
                               BS(AMAZONLINUX2_64)
 
 #define ALLVMKERNEL           BS(VMKERNEL), BS(VMKERNEL5), BS(VMKERNEL6), \
@@ -238,6 +239,8 @@ Bool Gos_InSetArray(uint32 gos, const uint32 *set);
 #define STR_OS_CENTOS6             "centos6"
 #define STR_OS_CENTOS7             "centos7"
 #define STR_OS_CENTOS8             "centos8"
+#define STR_OS_CRXPOD              "CRXPod"
+#define STR_OS_CRXSYS              "CRXSys"
 #define STR_OS_COBALT              "Cobalt"
 #define STR_OS_CONECTIVA           "Conectiva"
 #define STR_OS_DEBIAN              "Debian"
diff --git a/open-vm-tools/lib/include/guest_os_tables.h b/open-vm-tools/lib/include/guest_os_tables.h
index f551eee48..5385903bf 100644
--- a/open-vm-tools/lib/include/guest_os_tables.h
+++ b/open-vm-tools/lib/include/guest_os_tables.h
@@ -124,7 +124,9 @@ extern "C" {
    GOT(GUEST_OS_CENTOS6_64)                                                \
    GOT(GUEST_OS_CENTOS7_64)                                                \
    GOT(GUEST_OS_CENTOS8_64)                                                \
-   GOT(GUEST_OS_AMAZONLINUX2_64)
+   GOT(GUEST_OS_AMAZONLINUX2_64)                                           \
+   GOT(GUEST_OS_CRXSYS1_64)        /* VMware CRX system VM 1.0 64-bit */   \
+   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. */
@@ -144,6 +146,8 @@ extern "C" {
    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")      \