pool/virtualbox
SHA256
2
0
Fork 2
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Accepting request 1120634 from Virtualization

Browse Source 
OBS-URL: https://build.opensuse.org/request/show/1120634
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/virtualbox?expand=0&rev=266
This commit is contained in:
Ana Guerrero 2023-10-29 18:39:17 +00:00 committed by Git OBS Bridge
commit b12a080bec
2 changed files with 54 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

55
fixes_for_leap.patch
View File

@ -2,7 +2,7 @@ Index: VirtualBox-7.0.12/src/VBox/HostDrivers/VBoxNetFlt/linux/VBoxNetFlt-linux.
=================================================================== ===================================================================
--- VirtualBox-7.0.12.orig/src/VBox/HostDrivers/VBoxNetFlt/linux/VBoxNetFlt-linux.c --- VirtualBox-7.0.12.orig/src/VBox/HostDrivers/VBoxNetFlt/linux/VBoxNetFlt-linux.c
+++ VirtualBox-7.0.12/src/VBox/HostDrivers/VBoxNetFlt/linux/VBoxNetFlt-linux.c +++ VirtualBox-7.0.12/src/VBox/HostDrivers/VBoxNetFlt/linux/VBoxNetFlt-linux.c
@@ -89,6 +89,21 @@ @@ -89,6 +89,17 @@
#define VBOXNETFLT_OS_SPECFIC 1 #define VBOXNETFLT_OS_SPECFIC 1
#include "../VBoxNetFltInternal.h" #include "../VBoxNetFltInternal.h"
@ -13,13 +13,9 @@ Index: VirtualBox-7.0.12/src/VBox/HostDrivers/VBoxNetFlt/linux/VBoxNetFlt-linux.
+# define OPENSUSE_155 +# define OPENSUSE_155
+# endif +# endif
+ +
+#if !defined(skb_gso_segment) +#if RTLNX_SUSE_MAJ_PREREQ(15, 6)
+#if defined(CONFIG_SUSE_VERSION) && (CONFIG_SUSE_VERSION == 15)
+//#include <config/net/mpls/gso.h>
+#else
+#include <net/gso.h> +#include <net/gso.h>
+#endif +#endif
+#endif
+ +
typedef struct VBOXNETFLTNOTIFIER { typedef struct VBOXNETFLTNOTIFIER {
struct notifier_block Notifier; struct notifier_block Notifier;
@ -55,6 +51,22 @@ Index: VirtualBox-7.0.12/src/VBox/Additions/linux/drm/vbox_drv.c
#else /* >= 5.4.0 && RHEL >= 8.3 && SLES >= 15-SP3 */ #else /* >= 5.4.0 && RHEL >= 8.3 && SLES >= 15-SP3 */
.driver_features = DRIVER_MODESET | DRIVER_GEM | DRIVER_HAVE_IRQ, .driver_features = DRIVER_MODESET | DRIVER_GEM | DRIVER_HAVE_IRQ,
#endif /* < 5.4.0 */ #endif /* < 5.4.0 */
@@ -389,13 +393,13 @@ static struct drm_driver driver = {
#elif RTLNX_VER_MAX(5,12,0) && !RTLNX_RHEL_MAJ_PREREQ(8,5)
.dumb_destroy = drm_gem_dumb_destroy,
#endif
-#if RTLNX_VER_MAX(6,6,0)
+#if RTLNX_VER_MAX(6,6,0) && !RTLNX_SUSE_MAJ_PREREQ(15, 5)
.prime_handle_to_fd = drm_gem_prime_handle_to_fd,
.prime_fd_to_handle = drm_gem_prime_fd_to_handle,
#endif
.gem_prime_import = drm_gem_prime_import,
.gem_prime_import_sg_table = vbox_gem_prime_import_sg_table,
-#if RTLNX_VER_MAX(6,6,0)
+#if RTLNX_VER_MAX(6,6,0) && !RTLNX_SUSE_MAJ_PREREQ(15, 5)
.gem_prime_mmap = vbox_gem_prime_mmap,
#endif
Index: VirtualBox-7.0.12/src/VBox/Additions/linux/drm/vbox_main.c Index: VirtualBox-7.0.12/src/VBox/Additions/linux/drm/vbox_main.c
=================================================================== ===================================================================
--- VirtualBox-7.0.12.orig/src/VBox/Additions/linux/drm/vbox_main.c --- VirtualBox-7.0.12.orig/src/VBox/Additions/linux/drm/vbox_main.c
@ -425,6 +437,15 @@ Index: VirtualBox-7.0.12/src/VBox/Additions/linux/drm/vbox_fb.c
#include <VBoxVideo.h> #include <VBoxVideo.h>
@@ -196,7 +197,7 @@ static struct fb_ops vboxfb_ops = {
.owner = THIS_MODULE,
.fb_check_var = drm_fb_helper_check_var,
.fb_set_par = drm_fb_helper_set_par,
-#if RTLNX_VER_MIN(6,5,0)
+#if RTLNX_VER_MIN(6,5,0) || RTLNX_SUSE_MAJ_PREREQ(15, 6)
.fb_read = fb_sys_read,
.fb_write = fb_sys_write,
.fb_fillrect = sys_fillrect,
Index: VirtualBox-7.0.12/src/VBox/Additions/linux/drm/vbox_mode.c Index: VirtualBox-7.0.12/src/VBox/Additions/linux/drm/vbox_mode.c
=================================================================== ===================================================================
--- VirtualBox-7.0.12.orig/src/VBox/Additions/linux/drm/vbox_mode.c --- VirtualBox-7.0.12.orig/src/VBox/Additions/linux/drm/vbox_mode.c
@ -450,3 +471,25 @@ Index: VirtualBox-7.0.12/src/VBox/HostDrivers/VBoxNetAdp/linux/VBoxNetAdp-linux.
# define VBOX_DEV_ADDR_SET(dev, addr, len) dev_addr_mod(dev, 0, addr, len) # define VBOX_DEV_ADDR_SET(dev, addr, len) dev_addr_mod(dev, 0, addr, len)
#else /* < 5.17.0 */ #else /* < 5.17.0 */
# define VBOX_DEV_ADDR_SET(dev, addr, len) memcpy(dev->dev_addr, addr, len) # define VBOX_DEV_ADDR_SET(dev, addr, len) memcpy(dev->dev_addr, addr, len)
Index: VirtualBox-7.0.12/src/VBox/Runtime/r0drv/linux/memobj-r0drv-linux.c
===================================================================
--- VirtualBox-7.0.12.orig/src/VBox/Runtime/r0drv/linux/memobj-r0drv-linux.c
+++ VirtualBox-7.0.12/src/VBox/Runtime/r0drv/linux/memobj-r0drv-linux.c
@@ -1342,7 +1342,7 @@ DECLHIDDEN(int) rtR0MemObjNativeLockUser
fWrite, /* force write access. */
# endif
&pMemLnx->apPages[0] /* Page array. */
-# if GET_USER_PAGES_API < KERNEL_VERSION(6, 5, 0)
+# if GET_USER_PAGES_API < KERNEL_VERSION(6, 5, 0) && !RTLNX_SUSE_MAJ_PREREQ(15, 6)
, papVMAs /* vmas */
# endif
);
@@ -1389,7 +1389,7 @@ DECLHIDDEN(int) rtR0MemObjNativeLockUser
fWrite, /* force write access. */
# endif
&pMemLnx->apPages[0] /* Page array. */
-# if GET_USER_PAGES_API < KERNEL_VERSION(6, 5, 0)
+# if GET_USER_PAGES_API < KERNEL_VERSION(6, 5, 0) && !RTLNX_SUSE_MAJ_PREREQ(15, 6)
, papVMAs /* vmas */
# endif
);

5
virtualbox.changes
View File

@ -1,3 +1,8 @@
-------------------------------------------------------------------
Thu Oct 26 18:10:45 UTC 2023 - Larry Finger <Larry.Finger@gmail.com>
- Update file "fixes_for_leap.patch" to cover API change in Leap 15.6 kernel.
------------------------------------------------------------------- -------------------------------------------------------------------
Sat Oct 21 19:27:40 UTC 2023 - Larry Finger <Larry.Finger@gmail.com> Sat Oct 21 19:27:40 UTC 2023 - Larry Finger <Larry.Finger@gmail.com>