dgarcia/virtualbox
SHA256
1
0
Fork 0
forked from jengelh/virtualbox
Code Pull Requests Activity

Accepting request 854343 from home:lwfinger:branches:Virtualization

Browse Source 
OBS-URL: https://build.opensuse.org/request/show/854343
OBS-URL: https://build.opensuse.org/package/show/Virtualization/virtualbox?expand=0&rev=577
This commit is contained in:
Larry Finger
2020-12-09 20:22:12 +00:00
committed by Git OBS Bridge
parent ed6e7df33d
commit 3c1dc4f2d5
13 changed files with 298 additions and 234 deletions
Download Patch File Download Diff File Expand all files Collapse all files

39
fixes_for_leap15.2.patch
View File

@@ -1,7 +1,7 @@
Index: VirtualBox-6.1.14/src/VBox/HostDrivers/VBoxNetFlt/linux/VBoxNetFlt-linux.c
Index: VirtualBox-6.1.16/src/VBox/HostDrivers/VBoxNetFlt/linux/VBoxNetFlt-linux.c
===================================================================
--- VirtualBox-6.1.14.orig/src/VBox/HostDrivers/VBoxNetFlt/linux/VBoxNetFlt-linux.c
+++ VirtualBox-6.1.14/src/VBox/HostDrivers/VBoxNetFlt/linux/VBoxNetFlt-linux.c
--- VirtualBox-6.1.16.orig/src/VBox/HostDrivers/VBoxNetFlt/linux/VBoxNetFlt-linux.c
+++ VirtualBox-6.1.16/src/VBox/HostDrivers/VBoxNetFlt/linux/VBoxNetFlt-linux.c
@@ -73,6 +73,10 @@
#define VBOXNETFLT_OS_SPECFIC 1
#include "../VBoxNetFltInternal.h"
@@ -13,15 +13,18 @@ Index: VirtualBox-6.1.14/src/VBox/HostDrivers/VBoxNetFlt/linux/VBoxNetFlt-linux.
typedef struct VBOXNETFLTNOTIFIER {
struct notifier_block Notifier;
PVBOXNETFLTINS pThis;
Index: VirtualBox-6.1.14/src/VBox/Additions/linux/drm/vbox_drv.c
Index: VirtualBox-6.1.16/src/VBox/Additions/linux/drm/vbox_drv.c
===================================================================
--- VirtualBox-6.1.14.orig/src/VBox/Additions/linux/drm/vbox_drv.c
+++ VirtualBox-6.1.14/src/VBox/Additions/linux/drm/vbox_drv.c
@@ -305,11 +305,13 @@ static void vbox_master_drop(struct drm_
--- VirtualBox-6.1.16.orig/src/VBox/Additions/linux/drm/vbox_drv.c
+++ VirtualBox-6.1.16/src/VBox/Additions/linux/drm/vbox_drv.c
@@ -310,12 +310,15 @@ static void vbox_master_drop(struct drm_
}
static struct drm_driver driver = {
#if RTLNX_VER_MAX(5,4,0)
.driver_features =
- DRIVER_MODESET | DRIVER_GEM | DRIVER_HAVE_IRQ |
-#if RTLNX_VER_MAX(5,4,0) && !RTLNX_RHEL_MAJ_PREREQ(8,3)
- .driver_features = DRIVER_MODESET | DRIVER_GEM | DRIVER_HAVE_IRQ |
+#if RTLNX_VER_MAX(5,4,0)
+ .driver_features =
+#if LINUX_VERSION_CODE < KERNEL_VERSION(5, 4, 0)
+ DRIVER_PRIME |
+#endif
@@ -30,14 +33,14 @@ Index: VirtualBox-6.1.14/src/VBox/Additions/linux/drm/vbox_drv.c
# endif
- DRIVER_PRIME,
+ DRIVER_MODESET | DRIVER_GEM | DRIVER_HAVE_IRQ,
#else /* >= 5.4.0 */
#else /* >= 5.4.0 && RHEL >= 8.3 */
.driver_features = DRIVER_MODESET | DRIVER_GEM | DRIVER_HAVE_IRQ,
#endif /* < 5.4.0 */
Index: VirtualBox-6.1.14/src/VBox/Additions/linux/drm/vbox_main.c
Index: VirtualBox-6.1.16/src/VBox/Additions/linux/drm/vbox_main.c
===================================================================
--- VirtualBox-6.1.14.orig/src/VBox/Additions/linux/drm/vbox_main.c
+++ VirtualBox-6.1.14/src/VBox/Additions/linux/drm/vbox_main.c
@@ -628,8 +628,12 @@ static inline u64 vbox_bo_mmap_offset(st
--- VirtualBox-6.1.16.orig/src/VBox/Additions/linux/drm/vbox_main.c
+++ VirtualBox-6.1.16/src/VBox/Additions/linux/drm/vbox_main.c
@@ -638,8 +638,12 @@ static inline u64 vbox_bo_mmap_offset(st
#elif RTLNX_VER_MAX(3,12,0) && !RTLNX_RHEL_MAJ_PREREQ(7,0)
return bo->bo.addr_space_offset;
#else
@@ -50,10 +53,10 @@ Index: VirtualBox-6.1.14/src/VBox/Additions/linux/drm/vbox_main.c
}
int
Index: VirtualBox-6.1.14/include/iprt/cdefs.h
Index: VirtualBox-6.1.16/include/iprt/cdefs.h
===================================================================
--- VirtualBox-6.1.14.orig/include/iprt/cdefs.h
+++ VirtualBox-6.1.14/include/iprt/cdefs.h
--- VirtualBox-6.1.16.orig/include/iprt/cdefs.h
+++ VirtualBox-6.1.16/include/iprt/cdefs.h
@@ -1173,14 +1173,15 @@
* Tell the compiler that we're falling through to the next case in a switch.
* @sa RT_FALL_THRU */