Changeset 80712 in vbox for trunk/src/VBox/Additions/linux

Timestamp:

Sep 10, 2019 7:25:36 PM (5 years ago)

Author:

vboxsync

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

133253

Message:

Additions/linux: ticketref:18917: VBox 6.0.10 GAs fail to compile on Red Hat/CentOS/OL 7.7; also Red Hat 8.1 Beta

Location:

trunk/src/VBox/Additions/linux

Files:

• drm/vbox_drv.c (modified) (2 diffs)
• drm/vbox_drv.h (modified) (2 diffs)
• drm/vbox_irq.c (modified) (1 diff)
• drm/vbox_main.c (modified) (1 diff)
• drm/vbox_mode.c (modified) (3 diffs)
• drm/vbox_ttm.c (modified) (6 diffs)
• sharedfolders/regops.c (modified) (2 diffs)

trunk/src/VBox/Additions/linux/drm/vbox_drv.c

@@ -42 +42 @@
 #include "vbox_drv.h"
 
-#if LINUX_VERSION_CODE >= KERNEL_VERSION(5, 1, 0)
+#if LINUX_VERSION_CODE >= KERNEL_VERSION(5, 1, 0) || defined(RHEL_81)
 #include <drm/drm_probe_helper.h>
 #endif
@@ -308 +308 @@
         .driver_features =
             DRIVER_MODESET | DRIVER_GEM | DRIVER_HAVE_IRQ |
-#if LINUX_VERSION_CODE < KERNEL_VERSION(5, 1, 0)
+#if LINUX_VERSION_CODE < KERNEL_VERSION(5, 1, 0) && !defined(RHEL_81)
             DRIVER_IRQ_SHARED |
 #endif

trunk/src/VBox/Additions/linux/drm/vbox_drv.h

@@ -51 +51 @@
 
 #if defined(RHEL_MAJOR) && defined(RHEL_MINOR)
+# if RHEL_MAJOR == 8 && RHEL_MINOR >= 1
+#  define RHEL_81
+# endif
+# if RHEL_MAJOR == 8 && RHEL_MINOR >= 0
+#  define RHEL_80
+# endif
+# if RHEL_MAJOR == 7 && RHEL_MINOR >= 7
+#  define RHEL_77
+# endif
 # if RHEL_MAJOR == 7 && RHEL_MINOR >= 6
 #  define RHEL_76
@@ -188 +197 @@
 
         struct {
-#if LINUX_VERSION_CODE < KERNEL_VERSION(5, 0, 0)
+#if LINUX_VERSION_CODE < KERNEL_VERSION(5, 0, 0) && !defined(RHEL_77) && !defined(RHEL_81)
                 struct drm_global_reference mem_global_ref;
                 struct ttm_bo_global_ref bo_global_ref;

trunk/src/VBox/Additions/linux/drm/vbox_irq.c

@@ -36 +36 @@
 #if LINUX_VERSION_CODE < KERNEL_VERSION(5, 1, 0)
 #include <drm/drm_crtc_helper.h>
+# if defined(RHEL_81)
+#  include <drm/drm_probe_helper.h>
+# endif
 #else
 #include <drm/drm_probe_helper.h>

trunk/src/VBox/Additions/linux/drm/vbox_main.c

@@ -606 +606 @@
 #endif
 
-#if LINUX_VERSION_CODE < KERNEL_VERSION(4, 19, 0) && !defined(OPENSUSE_151)
+#if LINUX_VERSION_CODE < KERNEL_VERSION(4, 19, 0) && !defined(OPENSUSE_151) && !defined(RHEL_77) && !defined(RHEL_81)
 static void ttm_bo_put(struct ttm_buffer_object *bo)
 {

trunk/src/VBox/Additions/linux/drm/vbox_mode.c

@@ -43 +43 @@
 #include <drm/drm_plane_helper.h>
 #endif
-#if LINUX_VERSION_CODE >= KERNEL_VERSION(5, 1, 0)
+#if LINUX_VERSION_CODE >= KERNEL_VERSION(5, 1, 0) || defined(RHEL_81)
 #include <drm/drm_probe_helper.h>
 #endif
@@ -541 +541 @@
                 sum += edid[i];
         edid[EDID_SIZE - 1] = (0x100 - (sum & 0xFF)) & 0xFF;
-#if LINUX_VERSION_CODE >= KERNEL_VERSION(4, 19, 0) || defined(OPENSUSE_151)
+#if LINUX_VERSION_CODE >= KERNEL_VERSION(4, 19, 0) || defined(OPENSUSE_151) || defined(RHEL_77) || defined(RHEL_81)
         drm_connector_update_edid_property(connector, (struct edid *)edid);
 #else
@@ -716 +716 @@
 #endif
 
-#if LINUX_VERSION_CODE >= KERNEL_VERSION(4, 19, 0) || defined(OPENSUSE_151)
+#if LINUX_VERSION_CODE >= KERNEL_VERSION(4, 19, 0) || defined(OPENSUSE_151) || defined(RHEL_77) || defined(RHEL_81)
         drm_connector_attach_encoder(connector, encoder);
 #else

trunk/src/VBox/Additions/linux/drm/vbox_ttm.c

@@ -47 +47 @@
 }
 
-#if LINUX_VERSION_CODE < KERNEL_VERSION(5, 0, 0)
+#if LINUX_VERSION_CODE < KERNEL_VERSION(5, 0, 0) && !defined(RHEL_77) && !defined(RHEL_81)
 static int vbox_ttm_mem_global_init(struct drm_global_reference *ref)
 {
@@ -298 +298 @@
         struct ttm_bo_device *bdev = &vbox->ttm.bdev;
 
-#if LINUX_VERSION_CODE < KERNEL_VERSION(5, 0, 0)
+#if LINUX_VERSION_CODE < KERNEL_VERSION(5, 0, 0) && !defined(RHEL_77) && !defined(RHEL_81)
         ret = vbox_ttm_global_init(vbox);
         if (ret)
@@ -304 +304 @@
 #endif
         ret = ttm_bo_device_init(&vbox->ttm.bdev,
-#if LINUX_VERSION_CODE < KERNEL_VERSION(5, 0, 0)
+#if LINUX_VERSION_CODE < KERNEL_VERSION(5, 0, 0) && !defined(RHEL_77) && !defined(RHEL_81)
                                  vbox->ttm.bo_global_ref.ref.object,
 #endif
@@ -318 +318 @@
         if (ret) {
                 DRM_ERROR("Error initialising bo driver; %d\n", ret);
-#if LINUX_VERSION_CODE < KERNEL_VERSION(5, 0, 0)
+#if LINUX_VERSION_CODE < KERNEL_VERSION(5, 0, 0) && !defined(RHEL_77) && !defined(RHEL_81)
                 goto err_ttm_global_release;
 #else
@@ -344 +344 @@
 err_device_release:
         ttm_bo_device_release(&vbox->ttm.bdev);
-#if LINUX_VERSION_CODE < KERNEL_VERSION(5, 0, 0)
+#if LINUX_VERSION_CODE < KERNEL_VERSION(5, 0, 0) && !defined(RHEL_77) && !defined(RHEL_81)
 err_ttm_global_release:
         vbox_ttm_global_release(vbox);
@@ -361 +361 @@
 #endif
         ttm_bo_device_release(&vbox->ttm.bdev);
-#if LINUX_VERSION_CODE < KERNEL_VERSION(5, 0, 0)
+#if LINUX_VERSION_CODE < KERNEL_VERSION(5, 0, 0) && !defined(RHEL_77) && !defined(RHEL_81)
         vbox_ttm_global_release(vbox);
 #endif

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

@@ -80 +80 @@
 #endif
 
+#ifdef RHEL_RELEASE_CODE
+# if RHEL_RELEASE_CODE >= RHEL_RELEASE_VERSION(8, 1)
+#  define RHEL_81
+# endif
+#endif
 
 /*********************************************************************************************************************************
@@ -1409 +1414 @@
      * Check that this is valid user memory that is actually in the kernel range.
      */
-#if LINUX_VERSION_CODE >= KERNEL_VERSION(5, 0, 0)
+#if LINUX_VERSION_CODE >= KERNEL_VERSION(5, 0, 0) || defined(RHEL_81)
     if (   access_ok((void *)uPtrFrom, cPages << PAGE_SHIFT)
         && uPtrFrom >= USER_DS.seg)