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

Accepting request 744590 from home:lwfinger:branches:Virtualization

Browse Source 
- Update "fixes_for_5.4.patch" for kernel API backport in openSUSE 15.2

OBS-URL: https://build.opensuse.org/request/show/744590
OBS-URL: https://build.opensuse.org/package/show/Virtualization/virtualbox?expand=0&rev=517
This commit is contained in:
Larry Finger 2019-10-31 21:35:19 +00:00 committed by Git OBS Bridge
parent d7d68c55b8
commit 0ad3dd2ed3
2 changed files with 21 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
fixes_for_5.4.patch
View File

@ -6,7 +6,7 @@ Index: VirtualBox-6.0.14/src/VBox/HostDrivers/VBoxNetFlt/linux/VBoxNetFlt-linux.
for (i = 0; i < skb_shinfo(pBuf)->nr_frags; i++)
{
skb_frag_t *pFrag = &skb_shinfo(pBuf)->frags[i];
+#if LINUX_VERSION_CODE >= KERNEL_VERSION(5, 4, 0)
+#if LINUX_VERSION_CODE >= KERNEL_VERSION(5, 4, 0) || OPENSUSE_152
+ pSG->aSegs[iSeg].cb = pFrag->bv_len;
+ pSG->aSegs[iSeg].pv = VBOX_SKB_KMAP_FRAG(pFrag) + pFrag->bv_offset;
+#else
@ -20,7 +20,7 @@ Index: VirtualBox-6.0.14/src/VBox/HostDrivers/VBoxNetFlt/linux/VBoxNetFlt-linux.
for (i = 0; i < skb_shinfo(pFragBuf)->nr_frags; i++)
{
skb_frag_t *pFrag = &skb_shinfo(pFragBuf)->frags[i];
+#if LINUX_VERSION_CODE >= KERNEL_VERSION(5, 4, 0)
+#if LINUX_VERSION_CODE >= KERNEL_VERSION(5, 4, 0) || OPENSUSE_152
+ pSG->aSegs[iSeg].cb = pFrag->bv_len;
+ pSG->aSegs[iSeg].pv = VBOX_SKB_KMAP_FRAG(pFrag) + pFrag->bv_offset;
+#else
@ -128,3 +128,17 @@ Index: VirtualBox-6.0.14/include/iprt/cdefs.h
/** @def RT_IPRT_FORMAT_ATTR
Index: VirtualBox-6.0.14/src/VBox/Additions/linux/drm/vbox_drv.h
===================================================================
--- VirtualBox-6.0.14.orig/src/VBox/Additions/linux/drm/vbox_drv.h
+++ VirtualBox-6.0.14/src/VBox/Additions/linux/drm/vbox_drv.h
@@ -86,6 +86,9 @@
# if CONFIG_SUSE_VERSION == 15 && CONFIG_SUSE_PATCHLEVEL == 1
# define OPENSUSE_151
# endif
+# if CONFIG_SUSE_VERSION == 15 && CONFIG_SUSE_PATCHLEVEL == 2
+# define OPENSUSE_152
+# endif
#endif
#if LINUX_VERSION_CODE < KERNEL_VERSION(3, 14, 0) || defined(RHEL_71)

5
virtualbox.changes
View File

@ -1,3 +1,8 @@
-------------------------------------------------------------------
Thu Oct 31 18:55:37 UTC 2019 - Larry Finger <Larry.Finger@gmail.com>
- Update "fixes_for_5.4.patch" for kernel API backport in openSUSE 15.2
-------------------------------------------------------------------
Tue Oct 22 06:44:20 UTC 2019 - Larry Finger <Larry.Finger@gmail.com>