Changeset 85702 in vbox

Timestamp:

Aug 11, 2020 6:38:50 PM (5 years ago)

Author:

vboxsync

svn:sync-xref-src-repo-rev:

139842

Message:

IPRT,lnx-kmods: s/VBOX_RHEL_MAJ_PREREQ/RTLNX_RHEL_MAJ_PREREQ/ and added RTLNX_RHEL_PREREQ. Eliminated confusing RHEL_81 & RHEL_82 defines from the-linux-kernel.h.

Location:

trunk

Files:

• include/iprt/linux/version.h (modified) (1 diff)
• src/VBox/Additions/linux/sharedfolders/regops.c (modified) (1 diff)
• src/VBox/Runtime/r0drv/linux/memuserkernel-r0drv-linux.c (modified) (2 diffs)
• src/VBox/Runtime/r0drv/linux/the-linux-kernel.h (modified) (1 diff)

trunk/include/iprt/linux/version.h

@@ -53 +53 @@
 
 
-/** @def VBOX_RHEL_MAJ_PREREQ
+/** @def RTLNX_RHEL_PREREQ
+ * Require a minium RedHat release.
+ * @param a_iMajor      The major release number (RHEL_MAJOR).
+ * @param a_iMinor      The minor release number (RHEL_MINOR).
+ * @sa RTLNX_RHEL_MAJ_PREREQ
+ */
+#if defined(RHEL_MAJOR) && defined(RHEL_MINOR)
+# define RTLNX_RHEL_PREREQ(a_iMajor, a_iMinor) \
+     ((RHEL_MAJOR) > (a_iMajor) || ((RHEL_MAJOR) == (a_iMajor) && (RHEL_MINOR) >= (a_iMinor)))
+#else
+# define RTLNX_RHEL_PREREQ(a_iMajor, a_iMinor) (0)
+#endif
+
+/** @def RTLNX_RHEL_MAJ_PREREQ
  * Require a minimum minor release number for the given RedHat release.
  * @param a_iMajor      RHEL_MAJOR must _equal_ this.
  * @param a_iMinor      RHEL_MINOR must be greater or equal to this.
+ * @sa RTLNX_RHEL_PREREQ
  */
 #if defined(RHEL_MAJOR) && defined(RHEL_MINOR)
-# define VBOX_RHEL_MAJ_PREREQ(a_iMajor, a_iMinor) ((RHEL_MAJOR) == (a_iMajor) && (RHEL_MINOR) >= (a_iMinor))
+# define RTLNX_RHEL_MAJ_PREREQ(a_iMajor, a_iMinor) ((RHEL_MAJOR) == (a_iMajor) && (RHEL_MINOR) >= (a_iMinor))
 #else
-# define VBOX_RHEL_MAJ_PREREQ(a_iMajor, a_iMinor) (0)
+# define RTLNX_RHEL_MAJ_PREREQ(a_iMajor, a_iMinor) (0)
 #endif
 

trunk/src/VBox/Additions/linux/sharedfolders/regops.c

@@ -1402 +1402 @@
      * Check that this is valid user memory that is actually in the kernel range.
      */
-#if RTLNX_VER_MIN(5,0,0) || defined(RHEL_81)
+#if RTLNX_VER_MIN(5,0,0) || RTLNX_RHEL_PREREQ(8,1)
     if (   access_ok((void *)uPtrFrom, cPages << PAGE_SHIFT)
         && uPtrFrom >= USER_DS.seg)

trunk/src/VBox/Runtime/r0drv/linux/memuserkernel-r0drv-linux.c

@@ -67 +67 @@
 {
     IPRT_LINUX_SAVE_EFL_AC();
-#if RTLNX_VER_MIN(5,0,0) || defined(RHEL_81)
+#if RTLNX_VER_MIN(5,0,0) || RTLNX_RHEL_PREREQ(8,1)
     bool fRc = access_ok((void *)R3Ptr, 1);
 #else
@@ -87 +87 @@
 #else
 # error "PORT ME"
-#if RTLNX_VER_MIN(5,0,0) || defined(RHEL_81)
+#if RTLNX_VER_MIN(5,0,0) || RTLNX_RHEL_PREREQ(8,1)
     return !access_ok(pv, 1);
 #else

trunk/src/VBox/Runtime/r0drv/linux/the-linux-kernel.h

@@ -474 +474 @@
 RTDECL(struct page *) rtR0MemObjLinuxVirtToPage(void *pv);
 
-/*
- * Guest Additions changes specific to Red Hat 8.1 and later.
- */
-#ifdef RHEL_RELEASE_CODE
-# if RHEL_RELEASE_CODE >= RHEL_RELEASE_VERSION(8, 1)
-#  define RHEL_81
-# endif
-# if RHEL_RELEASE_CODE >= RHEL_RELEASE_VERSION(8, 2)
-#  define RHEL_82
-# endif
-#endif
-
 #endif /* !IPRT_INCLUDED_SRC_r0drv_linux_the_linux_kernel_h */