From: John Wolfe Date: Wed, 30 Jun 2021 18:37:27 +0000 (-0700) Subject: Add preliminary guest OS support of RHEL-9 for Arm. X-Git-Tag: stable-12.0.0~175 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=185952f4b8c85d0fb04eecd08be0673f9e800f70;p=thirdparty%2Fopen-vm-tools.git Add preliminary guest OS support of RHEL-9 for Arm. --- diff --git a/open-vm-tools/lib/include/guest_os.h b/open-vm-tools/lib/include/guest_os.h index 1c43e38b8..afc62609b 100644 --- a/open-vm-tools/lib/include/guest_os.h +++ b/open-vm-tools/lib/include/guest_os.h @@ -207,7 +207,8 @@ Bool Gos_InSetArray(uint32 gos, const uint32 *set); #define ALL5XLINUX32 BS(OTHER5XLINUX) #define ALL5XLINUX64 BS(OTHER5XLINUX_64), BS(ARM_OTHER5XLINUX_64), \ - BS(ARM_DEBIAN_64), BS(ARM_UBUNTU_64) + BS(ARM_DEBIAN_64), BS(ARM_UBUNTU_64), \ + BS(ARM_RHEL9_64) #define ALL6XLINUX32 BS(OTHER6XLINUX) @@ -328,6 +329,7 @@ Bool Gos_InSetArray(uint32 gos, const uint32 *set); #define STR_OS_PLD "PLD" #define STR_OS_RED_HAT "redhat" #define STR_OS_RED_HAT_EN "rhel" +#define STR_OS_ARM_RED_HAT_EN "arm-rhel" #define STR_OS_RED_HAT_FULL "Red Hat Linux" #define STR_OS_SLACKWARE "Slackware" #define STR_OS_SLES "sles" diff --git a/open-vm-tools/lib/include/guest_os_tables.h b/open-vm-tools/lib/include/guest_os_tables.h index ea9298aad..822a64a61 100644 --- a/open-vm-tools/lib/include/guest_os_tables.h +++ b/open-vm-tools/lib/include/guest_os_tables.h @@ -77,12 +77,12 @@ extern "C" { GOT(GUEST_OS_OTHER3XLINUX_64) /* Linux 3.x 64-bit */ \ GOT(GUEST_OS_OTHER4XLINUX) /* Linux 4.x 32-bit */ \ GOT(GUEST_OS_OTHER4XLINUX_64) /* Linux 4.x 64-bit */ \ - GOT(GUEST_OS_OTHER5XLINUX) /* Linux 5.x and later 32-bit */ \ - GOT(GUEST_OS_OTHER5XLINUX_64) /* Linux 5.x and later 64-bit */ \ - GOT(GUEST_OS_ARM_OTHER5XLINUX_64) /* Linux 5.x and later Arm 64-bit */ \ - GOT(GUEST_OS_OTHER6XLINUX) /* Linux 5.x and later 32-bit */ \ - GOT(GUEST_OS_OTHER6XLINUX_64) /* Linux 5.x and later 64-bit */ \ - GOT(GUEST_OS_ARM_OTHER6XLINUX_64) /* Linux 5.x and later Arm 64-bit */ \ + GOT(GUEST_OS_OTHER5XLINUX) /* Linux 5.x 32-bit */ \ + GOT(GUEST_OS_OTHER5XLINUX_64) /* Linux 5.x 64-bit */ \ + GOT(GUEST_OS_ARM_OTHER5XLINUX_64) /* Linux 5.x Arm 64-bit */ \ + GOT(GUEST_OS_OTHER6XLINUX) /* Linux 6.x and later 32-bit */ \ + GOT(GUEST_OS_OTHER6XLINUX_64) /* Linux 6.x and later 64-bit */ \ + GOT(GUEST_OS_ARM_OTHER6XLINUX_64) /* Linux 6.x and later Arm 64-bit */ \ GOT(GUEST_OS_OTHER) \ GOT(GUEST_OS_OTHER_64) /* Other 64-bit */ \ GOT(GUEST_OS_ARM_OTHER_64) /* Other Arm 64-bit */ \ @@ -95,6 +95,7 @@ extern "C" { GOT(GUEST_OS_RHEL) \ GOT(GUEST_OS_RHEL_64) \ GOT(GUEST_OS_RHEL9_64) \ + GOT(GUEST_OS_ARM_RHEL9_64) \ GOT(GUEST_OS_FREEBSD) \ GOT(GUEST_OS_FREEBSD_64) \ GOT(GUEST_OS_FREEBSD11) \