forked from pool/virtualbox
245cab47c0
- Pseudo version bump to 6.1.13, which is NOT an Oracle release.
Update VB sources to run under kernel 5.8.0+ with no modifications to the
kernel. These sources are derived from r85883 of the Oracle svn repository.
For operations with USB{2,3}, the extension pack for revision 140056 must
be installed. Once Oracle releases 6.1.14, then the extension pack and
VB itself will have the same revision number.
File "fixes_for_5.8.patch" is removed as that part was fixed upstream.
Fixes boo#1175201.
OBS-URL: https://build.opensuse.org/request/show/830373
OBS-URL: https://build.opensuse.org/package/show/Virtualization/virtualbox?expand=0&rev=568
76 lines
2.9 KiB
Diff
76 lines
2.9 KiB
Diff
Index: VirtualBox-6.1.13/src/VBox/HostDrivers/VBoxNetFlt/linux/VBoxNetFlt-linux.c
|
|
===================================================================
|
|
--- VirtualBox-6.1.13.orig/src/VBox/HostDrivers/VBoxNetFlt/linux/VBoxNetFlt-linux.c
|
|
+++ VirtualBox-6.1.13/src/VBox/HostDrivers/VBoxNetFlt/linux/VBoxNetFlt-linux.c
|
|
@@ -73,6 +73,10 @@
|
|
#define VBOXNETFLT_OS_SPECFIC 1
|
|
#include "../VBoxNetFltInternal.h"
|
|
|
|
+# if defined(CONFIG_SUSE_VERSION) && CONFIG_SUSE_VERSION == 15 && CONFIG_SUSE_PATCHLEVEL == 2
|
|
+# define OPENSUSE_152
|
|
+# endif
|
|
+
|
|
typedef struct VBOXNETFLTNOTIFIER {
|
|
struct notifier_block Notifier;
|
|
PVBOXNETFLTINS pThis;
|
|
Index: VirtualBox-6.1.13/src/VBox/Additions/linux/drm/vbox_drv.c
|
|
===================================================================
|
|
--- VirtualBox-6.1.13.orig/src/VBox/Additions/linux/drm/vbox_drv.c
|
|
+++ VirtualBox-6.1.13/src/VBox/Additions/linux/drm/vbox_drv.c
|
|
@@ -305,11 +305,13 @@ 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 LINUX_VERSION_CODE < KERNEL_VERSION(5, 4, 0)
|
|
+ DRIVER_PRIME |
|
|
+#endif
|
|
# if RTLNX_VER_MAX(5,1,0) && !RTLNX_RHEL_MAJ_PREREQ(8,1)
|
|
DRIVER_IRQ_SHARED |
|
|
# endif
|
|
- DRIVER_PRIME,
|
|
+ DRIVER_MODESET | DRIVER_GEM | DRIVER_HAVE_IRQ,
|
|
#else /* >= 5.4.0 */
|
|
.driver_features = DRIVER_MODESET | DRIVER_GEM | DRIVER_HAVE_IRQ,
|
|
#endif /* < 5.4.0 */
|
|
Index: VirtualBox-6.1.13/src/VBox/Additions/linux/drm/vbox_main.c
|
|
===================================================================
|
|
--- VirtualBox-6.1.13.orig/src/VBox/Additions/linux/drm/vbox_main.c
|
|
+++ VirtualBox-6.1.13/src/VBox/Additions/linux/drm/vbox_main.c
|
|
@@ -628,8 +628,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
|
|
+#if LINUX_VERSION_CODE >= KERNEL_VERSION(5, 4, 0)
|
|
+ return drm_vma_node_offset_addr(&bo->bo.base.vma_node);
|
|
+#else
|
|
return drm_vma_node_offset_addr(&bo->bo.vma_node);
|
|
#endif /* >= 5.4.0 */
|
|
+#endif
|
|
}
|
|
|
|
int
|
|
Index: VirtualBox-6.1.13/include/iprt/cdefs.h
|
|
===================================================================
|
|
--- VirtualBox-6.1.13.orig/include/iprt/cdefs.h
|
|
+++ VirtualBox-6.1.13/include/iprt/cdefs.h
|
|
@@ -1240,14 +1240,15 @@
|
|
#if RT_CLANG_PREREQ(4, 0) && RT_CPLUSPLUS_PREREQ(201100)
|
|
# define RT_FALL_THROUGH() [[clang::fallthrough]]
|
|
#elif RT_GNUC_PREREQ(7, 0)
|
|
-# define RT_FALL_THROUGH() __attribute__((__fallthrough__))
|
|
+# define FALL_THROUGH __attribute__((__fallthrough__))
|
|
#else
|
|
-# define RT_FALL_THROUGH() (void)0
|
|
+# define FALL_THROUGH (void)0
|
|
#endif
|
|
/** @def RT_FALL_THRU
|
|
* Tell the compiler that we're falling thru to the next case in a switch.
|
|
* @sa RT_FALL_THROUGH */
|
|
-#define RT_FALL_THRU() RT_FALL_THROUGH()
|
|
+#define RT_FALL_THRU() FALL_THROUGH
|
|
+#define RT_FALL_THROUGH() FALL_THROUGH
|
|
|
|
|
|
/** @def RT_IPRT_FORMAT_ATTR
|