From 4be1f2dff3986fef35dd61a1250cf7caf554c971a55bf807c3e648501c58754e Mon Sep 17 00:00:00 2001 From: Larry Finger Date: Thu, 9 Mar 2017 19:01:36 +0000 Subject: [PATCH] OBS-URL: https://build.opensuse.org/package/show/Virtualization/virtualbox?expand=0&rev=318 --- VirtualBox-5.1.14-patched.tar.bz2 | 3 - VirtualBox-5.1.16-patched.tar.bz2 | 3 + vbox_fix_4.10_api_changes.patch | 15 --- vbox_fix_4.11_api_changes.patch | 203 ------------------------------ 4 files changed, 3 insertions(+), 221 deletions(-) delete mode 100644 VirtualBox-5.1.14-patched.tar.bz2 create mode 100644 VirtualBox-5.1.16-patched.tar.bz2 delete mode 100644 vbox_fix_4.10_api_changes.patch delete mode 100644 vbox_fix_4.11_api_changes.patch diff --git a/VirtualBox-5.1.14-patched.tar.bz2 b/VirtualBox-5.1.14-patched.tar.bz2 deleted file mode 100644 index 7e71d0f..0000000 --- a/VirtualBox-5.1.14-patched.tar.bz2 +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:68f9019043e4ae409b357fc65c67dcc41b3afdfc09de4442b988f4d8dfb6e544 -size 80296668 diff --git a/VirtualBox-5.1.16-patched.tar.bz2 b/VirtualBox-5.1.16-patched.tar.bz2 new file mode 100644 index 0000000..002696e --- /dev/null +++ b/VirtualBox-5.1.16-patched.tar.bz2 @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:3b3034fcf52cf92f9f7db21882f2e438fefa48ca173852923e4e88f10c3a645e +size 80996784 diff --git a/vbox_fix_4.10_api_changes.patch b/vbox_fix_4.10_api_changes.patch deleted file mode 100644 index 0daa282..0000000 --- a/vbox_fix_4.10_api_changes.patch +++ /dev/null @@ -1,15 +0,0 @@ - -Index: VirtualBox-5.1.14/src/VBox/Additions/linux/sharedfolders/lnkops.c -=================================================================== ---- VirtualBox-5.1.14.orig/src/VBox/Additions/linux/sharedfolders/lnkops.c -+++ VirtualBox-5.1.14/src/VBox/Additions/linux/sharedfolders/lnkops.c -@@ -90,7 +90,9 @@ static const char *sf_get_link(struct de - - struct inode_operations sf_lnk_iops = - { -+# if LINUX_VERSION_CODE < KERNEL_VERSION(4, 10, 0) - .readlink = generic_readlink, -+#endif - # if LINUX_VERSION_CODE >= KERNEL_VERSION(4, 5, 0) - .get_link = sf_get_link - # elif LINUX_VERSION_CODE >= KERNEL_VERSION(4, 2, 0) diff --git a/vbox_fix_4.11_api_changes.patch b/vbox_fix_4.11_api_changes.patch deleted file mode 100644 index 1973597..0000000 --- a/vbox_fix_4.11_api_changes.patch +++ /dev/null @@ -1,203 +0,0 @@ -Index: VirtualBox-5.1.14/src/VBox/Runtime/r0drv/linux/semmutex-r0drv-linux.c -=================================================================== ---- VirtualBox-5.1.14.orig/src/VBox/Runtime/r0drv/linux/semmutex-r0drv-linux.c -+++ VirtualBox-5.1.14/src/VBox/Runtime/r0drv/linux/semmutex-r0drv-linux.c -@@ -40,8 +40,9 @@ - #include - - #include "internal/magics.h" -- -- -+#if LINUX_VERSION_CODE >= KERNEL_VERSION(4, 11, 0) -+#include -+#endif - /********************************************************************************************************************************* - * Structures and Typedefs * - *********************************************************************************************************************************/ -@@ -206,7 +207,7 @@ static int rtSemMutexLinuxRequestSleep(P - break; - - /* Go to sleep. */ -- set_task_state(pSelf, fInterruptible ? TASK_INTERRUPTIBLE : TASK_UNINTERRUPTIBLE); -+ set_current_state(fInterruptible ? TASK_INTERRUPTIBLE : TASK_UNINTERRUPTIBLE); - spin_unlock_irq(&pThis->Spinlock); - - lTimeout = schedule_timeout(lTimeout); -Index: VirtualBox-5.1.14/src/VBox/Runtime/r0drv/linux/semeventmulti-r0drv-linux.c -=================================================================== ---- VirtualBox-5.1.14.orig/src/VBox/Runtime/r0drv/linux/semeventmulti-r0drv-linux.c -+++ VirtualBox-5.1.14/src/VBox/Runtime/r0drv/linux/semeventmulti-r0drv-linux.c -@@ -32,6 +32,9 @@ - #include "the-linux-kernel.h" - #include "internal/iprt.h" - #include -+#if LINUX_VERSION_CODE >= KERNEL_VERSION(4, 11, 0) -+#include -+#endif - - #include - #include -Index: VirtualBox-5.1.14/src/VBox/Runtime/r0drv/linux/thread2-r0drv-linux.c -=================================================================== ---- VirtualBox-5.1.14.orig/src/VBox/Runtime/r0drv/linux/thread2-r0drv-linux.c -+++ VirtualBox-5.1.14/src/VBox/Runtime/r0drv/linux/thread2-r0drv-linux.c -@@ -35,6 +35,10 @@ - #include - #include - #include "internal/thread.h" -+#if LINUX_VERSION_CODE >= KERNEL_VERSION(4, 11, 0) -+#include -+#include -+#endif - - - RTDECL(RTTHREAD) RTThreadSelf(void) -Index: VirtualBox-5.1.14/src/VBox/Runtime/r0drv/linux/semevent-r0drv-linux.c -=================================================================== ---- VirtualBox-5.1.14.orig/src/VBox/Runtime/r0drv/linux/semevent-r0drv-linux.c -+++ VirtualBox-5.1.14/src/VBox/Runtime/r0drv/linux/semevent-r0drv-linux.c -@@ -38,11 +38,13 @@ - #include - #include - #include -+#if LINUX_VERSION_CODE >= KERNEL_VERSION(4, 11, 0) -+#include -+#endif - - #include "waitqueue-r0drv-linux.h" - #include "internal/magics.h" - -- - /********************************************************************************************************************************* - * Structures and Typedefs * - *********************************************************************************************************************************/ -Index: VirtualBox-5.1.14/src/VBox/Additions/linux/sharedfolders/utils.c -=================================================================== ---- VirtualBox-5.1.14.orig/src/VBox/Additions/linux/sharedfolders/utils.c -+++ VirtualBox-5.1.14/src/VBox/Additions/linux/sharedfolders/utils.c -@@ -290,8 +290,15 @@ sf_dentry_revalidate(struct dentry *dent - has inode at all) from these new attributes we derive [kstat] via - [generic_fillattr] */ - #if LINUX_VERSION_CODE >= KERNEL_VERSION(2, 6, 0) -+#if LINUX_VERSION_CODE >= KERNEL_VERSION(4, 11, 0) -+int sf_getattr(const struct path *path, struct kstat *kstat, -+ u32 request_mask, unsigned int flags) -+{ -+ struct dentry *dentry = path->dentry; -+#else - int sf_getattr(struct vfsmount *mnt, struct dentry *dentry, struct kstat *kstat) - { -+#endif - int err; - - TRACE(); -Index: VirtualBox-5.1.14/src/VBox/Additions/linux/sharedfolders/vfsmod.h -=================================================================== ---- VirtualBox-5.1.14.orig/src/VBox/Additions/linux/sharedfolders/vfsmod.h -+++ VirtualBox-5.1.14/src/VBox/Additions/linux/sharedfolders/vfsmod.h -@@ -100,8 +100,13 @@ extern int sf_stat(const char *caller, - SHFLSTRING *path, PSHFLFSOBJINFO result, int ok_to_fail); - extern int sf_inode_revalidate(struct dentry *dentry); - #if LINUX_VERSION_CODE >= KERNEL_VERSION(2, 6, 0) --extern int sf_getattr(struct vfsmount *mnt, struct dentry *dentry, -- struct kstat *kstat); -+#if LINUX_VERSION_CODE >= KERNEL_VERSION(4, 11, 0) -+extern int sf_getattr(const struct path *path, struct kstat *kstat, -+ u32 request_mask, unsigned int flags); -+#else -+extern int sf_getattr(struct vfsmount *mnt, struct dentry *dentry, -+ struct kstat *kstat); -+#endif - extern int sf_setattr(struct dentry *dentry, struct iattr *iattr); - #endif - extern int sf_path_from_dentry(const char *caller, struct sf_glob_info *sf_g, -Index: VirtualBox-5.1.14/src/VBox/Additions/linux/sharedfolders/regops.c -=================================================================== ---- VirtualBox-5.1.14.orig/src/VBox/Additions/linux/sharedfolders/regops.c -+++ VirtualBox-5.1.14/src/VBox/Additions/linux/sharedfolders/regops.c -@@ -445,7 +445,11 @@ static int sf_reg_release(struct inode * - } - - #if LINUX_VERSION_CODE > KERNEL_VERSION(2, 6, 25) -+#if LINUX_VERSION_CODE >= KERNEL_VERSION(4, 11, 0) -+static int sf_reg_fault(struct vm_fault *vmf) -+#else - static int sf_reg_fault(struct vm_area_struct *vma, struct vm_fault *vmf) -+#endif - #elif LINUX_VERSION_CODE >= KERNEL_VERSION(2, 6, 0) - static struct page *sf_reg_nopage(struct vm_area_struct *vma, unsigned long vaddr, int *type) - # define SET_TYPE(t) *type = (t) -@@ -459,6 +463,9 @@ static struct page *sf_reg_nopage(struct - loff_t off; - uint32_t nread = PAGE_SIZE; - int err; -+#if LINUX_VERSION_CODE >= KERNEL_VERSION(4, 11, 0) -+ struct vm_area_struct *vma = vmf->vma; -+#endif - struct file *file = vma->vm_file; - struct inode *inode = GET_F_DENTRY(file)->d_inode; - struct sf_glob_info *sf_g = GET_GLOB_INFO(inode->i_sb); -Index: VirtualBox-5.1.14/src/VBox/Additions/linux/drm/vbox_drv.c -=================================================================== ---- VirtualBox-5.1.14.orig/src/VBox/Additions/linux/drm/vbox_drv.c -+++ VirtualBox-5.1.14/src/VBox/Additions/linux/drm/vbox_drv.c -@@ -45,6 +45,11 @@ - /* - * Authors: Dave Airlie - */ -+#include -+#if LINUX_VERSION_CODE >= KERNEL_VERSION(4, 11, 0) -+#include -+#include -+#endif - #include "vbox_drv.h" - - #include -@@ -57,7 +62,6 @@ - - #include - #include -- - int vbox_modeset = -1; - - MODULE_PARM_DESC(modeset, "Disable/Enable modesetting"); -Index: VirtualBox-5.1.14/src/VBox/Runtime/r0drv/linux/the-linux-kernel.h -=================================================================== ---- VirtualBox-5.1.14.orig/src/VBox/Runtime/r0drv/linux/the-linux-kernel.h -+++ VirtualBox-5.1.14/src/VBox/Runtime/r0drv/linux/the-linux-kernel.h -@@ -31,8 +31,11 @@ - * Include iprt/types.h to install the bool wrappers. - * Then use the linux bool type for all the stuff include here. - */ -+#include - #include -+#if LINUX_VERSION_CODE < KERNEL_VERSION(4, 11, 0) - #define bool linux_bool -+#endif - - #if RT_GNUC_PREREQ(4, 6) - # pragma GCC diagnostic push -@@ -44,7 +47,6 @@ - # endif - #endif - --#include - #if LINUX_VERSION_CODE >= KERNEL_VERSION(2, 6, 33) - # include - #else -Index: VirtualBox-5.1.14/src/VBox/Additions/linux/drm/vbox_fb.c -=================================================================== ---- VirtualBox-5.1.14.orig/src/VBox/Additions/linux/drm/vbox_fb.c -+++ VirtualBox-5.1.14/src/VBox/Additions/linux/drm/vbox_fb.c -@@ -46,6 +46,11 @@ - * Authors: Dave Airlie - */ - /* Include from most specific to most general to be able to override things. */ -+#include -+#if LINUX_VERSION_CODE >= KERNEL_VERSION(4, 11, 0) -+#include -+#include -+#endif - #include "vbox_drv.h" - #include - #include