Changeset 85701 in vbox

Timestamp:

Aug 11, 2020 5:46:17 PM (5 years ago)

Author:

vboxsync

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

139841

Message:

IPRT,lnx-kmods: Added VBOX_RHEL_MAJ_PREREQ and RTLNX_SUSE_MAJ_PREREQ to version.h. Started using them.

Location:

trunk

Files:

• include/iprt/linux/version.h (modified) (1 diff)
• src/VBox/HostDrivers/VBoxNetFlt/linux/VBoxNetFlt-linux.c (modified) (3 diffs)
• src/VBox/Runtime/r0drv/linux/waitqueue-r0drv-linux.h (modified) (1 diff)

trunk/include/iprt/linux/version.h

@@ -52 +52 @@
      && LINUX_VERSION_CODE <  KERNEL_VERSION(a_MajorMax, a_MinorMax, a_PatchMax) )
 
+
+/** @def VBOX_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.
+ */
+#if defined(RHEL_MAJOR) && defined(RHEL_MINOR)
+# define VBOX_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)
+#endif
+
+/** @def RTLNX_SUSE_MAJ_PREREQ
+ * Require a minimum minor release number for the given SUSE release.
+ * @param a_iMajor      CONFIG_SUSE_VERSION must _equal_ this.
+ * @param a_iMinor      CONFIG_SUSE_PATCHLEVEL must be greater or equal to this.
+ */
+#if defined(CONFIG_SUSE_VERSION) && defined(CONFIG_SUSE_PATCHLEVEL)
+# define RTLNX_SUSE_MAJ_PREREQ(a_iMajor, a_iMinor) ((CONFIG_SUSE_VERSION) == (a_iMajor) && (CONFIG_SUSE_PATCHLEVEL) >= (a_iMinor))
+#else
+# define RTLNX_SUSE_MAJ_PREREQ(a_iMajor, a_iMinor) (0)
+#endif
+
+
 #endif /* !IPRT_INCLUDED_linux_version_h */
 

trunk/src/VBox/HostDrivers/VBoxNetFlt/linux/VBoxNetFlt-linux.c

@@ -206 +206 @@
  * GRO support was backported to RHEL 5.4
  */
-#ifdef RHEL_RELEASE_CODE
-# if RHEL_RELEASE_CODE >= RHEL_RELEASE_VERSION(5, 4)
-#  define VBOXNETFLT_WITH_GRO               1
-# endif
-#endif
-
-#if defined(CONFIG_SUSE_VERSION)
-# if CONFIG_SUSE_VERSION == 15 && CONFIG_SUSE_PATCHLEVEL == 2
-#  define OPENSUSE_152
-# endif
+#if RTLNX_RHEL_MAJ_PREREQ(5, 4)
+# define VBOXNETFLT_WITH_GRO                1
 #endif
 
@@ -929 +921 @@
     {
         skb_frag_t *pFrag = &skb_shinfo(pBuf)->frags[i];
-# if RTLNX_VER_MIN(5,4,0) || defined(OPENSUSE_152)
+# if RTLNX_VER_MIN(5,4,0) || RTLNX_SUSE_MAJ_PREREQ(15, 2)
         pSG->aSegs[iSeg].cb = pFrag->bv_len;
         pSG->aSegs[iSeg].pv = VBOX_SKB_KMAP_FRAG(pFrag) + pFrag->bv_offset;
@@ -950 +942 @@
         {
             skb_frag_t *pFrag = &skb_shinfo(pFragBuf)->frags[i];
-# if RTLNX_VER_MIN(5,4,0) || defined(OPENSUSE_152)
+# if RTLNX_VER_MIN(5,4,0) || RTLNX_SUSE_MAJ_PREREQ(15, 2)
             pSG->aSegs[iSeg].cb = pFrag->bv_len;
             pSG->aSegs[iSeg].pv = VBOX_SKB_KMAP_FRAG(pFrag) + pFrag->bv_offset;

trunk/src/VBox/Runtime/r0drv/linux/waitqueue-r0drv-linux.h

@@ -49 +49 @@
 {
     /** The wait queue entry. */
-#if LINUX_VERSION_CODE > KERNEL_VERSION(4, 13, 0) \
-  || defined(CONFIG_SUSE_VERSION) && CONFIG_SUSE_VERSION == 12 && CONFIG_SUSE_PATCHLEVEL >= 4 \
-  || defined(CONFIG_SUSE_VERSION) && CONFIG_SUSE_VERSION == 15
+#if RTLNX_VER_MIN(4,13,0) || RTLNX_SUSE_MAJ_PREREQ(12, 4) || RTLNX_SUSE_MAJ_PREREQ(15, 0)
     wait_queue_entry_t WaitQE;
 #else