UBUNTU: ubuntu: vbox -- Update to 5.1.16-dfsg-1

BugLink: http://bugs.launchpad.net/bugs/1671470
Signed-off-by: Seth Forshee <seth.forshee@canonical.com>

diff --git a/ubuntu/vbox/BOM b/ubuntu/vbox/BOM
index d825b283d1f0b01f2c29b07d4c44f54b99c723a1..041fb98adf58ea409b06415ba917a088fcfca273 100644 (file)
--- a/ubuntu/vbox/BOM
+++ b/ubuntu/vbox/BOM
@@ -1,2 +1,2 @@
-Source: http://ports.ubuntu.com/pool/multiverse/v/virtualbox/virtualbox-guest-dkms_5.1.14-dfsg-3_all.deb
-Version: 5.1.14-dfsg-3
+Source: http://ports.ubuntu.com/pool/multiverse/v/virtualbox/virtualbox-guest-dkms_5.1.16-dfsg-1_all.deb
+Version: 5.1.16-dfsg-1

diff --git a/ubuntu/vbox/dkms.conf b/ubuntu/vbox/dkms.conf
index 01be37209490ec55a8b757cf911aeed8a4fbc2b2..b4bf0940e543a32cfde9a2ec74b1892ca3958a64 100644 (file)
--- a/ubuntu/vbox/dkms.conf
+++ b/ubuntu/vbox/dkms.conf
@@ -1,5 +1,5 @@
 PACKAGE_NAME="virtualbox-guest"
-PACKAGE_VERSION="5.1.14"
+PACKAGE_VERSION="5.1.16"
 CLEAN="rm -f *.*o"
 BUILT_MODULE_NAME[0]="vboxguest"
 BUILT_MODULE_LOCATION[0]="vboxguest"

diff --git a/ubuntu/vbox/include/iprt/asm.h b/ubuntu/vbox/include/iprt/asm.h
index 9bca79b59b27242692f37e265bac323935851555..c3d9a2500de35ee0188dc205748618d7b6b99c5a 100644 (file)
--- a/ubuntu/vbox/include/iprt/asm.h
+++ b/ubuntu/vbox/include/iprt/asm.h
@@ -3872,7 +3872,7 @@ DECLINLINE(void) ASMMemFill32(volatile void *pv, size_t cb, uint32_t u32)
  *
  * @todo Fix name, it is a predicate function but it's not returning boolean!
  */
-#if !defined(RT_OS_LINUX) || !defined(__KERNEL__)
+#if !defined(RDESKTOP) && (!defined(RT_OS_LINUX) || !defined(__KERNEL__))
 DECLASM(void *) ASMMemFirstNonZero(void const *pv, size_t cb);
 #else
 DECLINLINE(void *) ASMMemFirstNonZero(void const *pv, size_t cb)

diff --git a/ubuntu/vbox/include/iprt/mangling.h b/ubuntu/vbox/include/iprt/mangling.h
index 465100afad487e8f1890d7afd3c7c6c74cb0a7a1..95c9c96a2545767f1cd27cb643dc057be469b76e 100644 (file)
--- a/ubuntu/vbox/include/iprt/mangling.h
+++ b/ubuntu/vbox/include/iprt/mangling.h
@@ -10,7 +10,7 @@
  */
 
 /*
- * Copyright (C) 2011-2016 Oracle Corporation
+ * Copyright (C) 2011-2017 Oracle Corporation
  *
  * This file is part of VirtualBox Open Source Edition (OSE), as
  * available from http://www.virtualbox.org. This file is free software;
@@ -594,6 +594,8 @@
 # define RTCircBufFree                                  RT_MANGLER(RTCircBufFree)
 # define RTCircBufIsReading                             RT_MANGLER(RTCircBufIsReading)
 # define RTCircBufIsWriting                             RT_MANGLER(RTCircBufIsWriting)
+# define RTCircBufOffsetRead                            RT_MANGLER(RTCircBufOffsetRead)
+# define RTCircBufOffsetWrite                           RT_MANGLER(RTCircBufOffsetWrite)
 # define RTCircBufReleaseReadBlock                      RT_MANGLER(RTCircBufReleaseReadBlock)
 # define RTCircBufReleaseWriteBlock                     RT_MANGLER(RTCircBufReleaseWriteBlock)
 # define RTCircBufReset                                 RT_MANGLER(RTCircBufReset)
@@ -1359,6 +1361,8 @@
 # define RTNetIPv6PseudoChecksum                        RT_MANGLER(RTNetIPv6PseudoChecksum)
 # define RTNetIPv6PseudoChecksumBits                    RT_MANGLER(RTNetIPv6PseudoChecksumBits)
 # define RTNetIPv6PseudoChecksumEx                      RT_MANGLER(RTNetIPv6PseudoChecksumEx)
+# define RTNetMaskToPrefixIPv4                          RT_MANGLER(RTNetMaskToPrefixIPv4)
+# define RTNetPrefixToMaskIPv4                          RT_MANGLER(RTNetPrefixToMaskIPv4)
 # define RTNetTCPChecksum                               RT_MANGLER(RTNetTCPChecksum)
 # define RTNetUDPChecksum                               RT_MANGLER(RTNetUDPChecksum)
 # define RTNetStrToMacAddr                              RT_MANGLER(RTNetStrToMacAddr)

diff --git a/ubuntu/vbox/include/iprt/net.h b/ubuntu/vbox/include/iprt/net.h
index 5d27bdf33da57f18728183c56dcbfb14b805f45d..4b54a636c856c48361e28e82357b8f6a91604ec2 100644 (file)
--- a/ubuntu/vbox/include/iprt/net.h
+++ b/ubuntu/vbox/include/iprt/net.h
@@ -102,6 +102,30 @@ RTDECL(int) RTNetStrToIPv4AddrEx(const char *pcszAddr, PRTNETADDRIPV4 pAddr, cha
  */
 RTDECL(int) RTNetStrToIPv4Addr(const char *pcszAddr, PRTNETADDRIPV4 pAddr);
 
+/**
+ * Verifies that RTNETADDRIPV4 is a valid contiguous netmask and
+ * computes its prefix length.
+ *
+ * @returns VINF_SUCCESS on success, VERR_INVALID_PARAMETER on
+ *          failure.
+ *
+ * @param   pMask           The netmask to verify and convert.
+ * @param   piPrefix        Where to store the prefix length. (Optional)
+ */
+RTDECL(int) RTNetMaskToPrefixIPv4(PCRTNETADDRIPV4 pMask, int *piPrefix);
+
+/**
+ * Computes netmask corresponding to the prefix length.
+ *
+ * @returns VINF_SUCCESS on success, VERR_INVALID_PARAMETER on
+ *          failure.
+ *
+ * @param   iPrefix         The prefix to convert.
+ * @param   pMask           Where to store the netmask.
+ */
+RTDECL(int) RTNetPrefixToMaskIPv4(int iPrefix, PRTNETADDRIPV4 pMask);
+
+
 /**
  * IPv6 address.
  */

diff --git a/ubuntu/vbox/include/iprt/x86.h b/ubuntu/vbox/include/iprt/x86.h
index cd9415cd00fcd25031019a370cdd6f172cf10bcf..785717e77647650ed0c5cdeadf9fdcd6d365c47c 100644 (file)
--- a/ubuntu/vbox/include/iprt/x86.h
+++ b/ubuntu/vbox/include/iprt/x86.h
@@ -3250,9 +3250,9 @@ typedef struct X86DESCGATE
     unsigned    u16Sel : 16;
     /** 20 - Number of parameters for a call-gate.
      * Ignored if interrupt-, trap- or task-gate. */
-    unsigned    u4ParmCount : 4;
-    /** 24 - Reserved / ignored. */
-    unsigned    u4Reserved : 4;
+    unsigned    u5ParmCount : 5;
+    /** 25 - Reserved / ignored. */
+    unsigned    u3Reserved : 3;
     /** 28 - Segment Type. */
     unsigned    u4Type : 4;
     /** 2c - Descriptor Type (0 = system). */

diff --git a/ubuntu/vbox/include/the-linux-kernel.h b/ubuntu/vbox/include/the-linux-kernel.h
index d5e92acfac055f3f582ff7d40621c5546ae3d307..5a7ccb23505e0ae697afc6d49470a494f0a827ec 100644 (file)
--- a/ubuntu/vbox/include/the-linux-kernel.h
+++ b/ubuntu/vbox/include/the-linux-kernel.h
@@ -103,6 +103,10 @@
 #if LINUX_VERSION_CODE >= KERNEL_VERSION(3, 9, 0)
 # include <linux/sched/rt.h>
 #endif
+#if LINUX_VERSION_CODE >= KERNEL_VERSION(4, 11, 0)
+# include <linux/sched/signal.h>
+# include <linux/sched/types.h>
+#endif
 #if LINUX_VERSION_CODE >= KERNEL_VERSION(2, 6, 7)
 # include <linux/jiffies.h>
 #endif

diff --git a/ubuntu/vbox/r0drv/linux/semmutex-r0drv-linux.c b/ubuntu/vbox/r0drv/linux/semmutex-r0drv-linux.c
index c2adfce0413de5576f34e6a902ae5b1bebaf73a0..8202c1a2cdcb87cc1936b421911cbd754293ef67 100644 (file)
--- a/ubuntu/vbox/r0drv/linux/semmutex-r0drv-linux.c
+++ b/ubuntu/vbox/r0drv/linux/semmutex-r0drv-linux.c
@@ -206,7 +206,7 @@ static int rtSemMutexLinuxRequestSleep(PRTSEMMUTEXINTERNAL pThis, RTMSINTERVAL c
             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);

diff --git a/ubuntu/vbox/r0drv/linux/the-linux-kernel.h b/ubuntu/vbox/r0drv/linux/the-linux-kernel.h
index d5e92acfac055f3f582ff7d40621c5546ae3d307..5a7ccb23505e0ae697afc6d49470a494f0a827ec 100644 (file)
--- a/ubuntu/vbox/r0drv/linux/the-linux-kernel.h
+++ b/ubuntu/vbox/r0drv/linux/the-linux-kernel.h
@@ -103,6 +103,10 @@
 #if LINUX_VERSION_CODE >= KERNEL_VERSION(3, 9, 0)
 # include <linux/sched/rt.h>
 #endif
+#if LINUX_VERSION_CODE >= KERNEL_VERSION(4, 11, 0)
+# include <linux/sched/signal.h>
+# include <linux/sched/types.h>
+#endif
 #if LINUX_VERSION_CODE >= KERNEL_VERSION(2, 6, 7)
 # include <linux/jiffies.h>
 #endif

diff --git a/ubuntu/vbox/vboxguest/revision-generated.h b/ubuntu/vbox/vboxguest/revision-generated.h
index 08332bc35af61b6f1c9d425847bdf23dfac3ed46..207b71f54a0ca734a3445dd548b0897c3ffc8074 100644 (file)
--- a/ubuntu/vbox/vboxguest/revision-generated.h
+++ b/ubuntu/vbox/vboxguest/revision-generated.h
@@ -1 +1 @@
-#define VBOX_SVN_REV 112924
+#define VBOX_SVN_REV 113841

diff --git a/ubuntu/vbox/vboxguest/version-generated.h b/ubuntu/vbox/vboxguest/version-generated.h
index 9279c48c8f68354aea71a8375631e3b45c8e57aa..a929383249580c347b6645eb3f7f17f2d1ac9465 100644 (file)
--- a/ubuntu/vbox/vboxguest/version-generated.h
+++ b/ubuntu/vbox/vboxguest/version-generated.h
@@ -3,9 +3,9 @@
 
 #define VBOX_VERSION_MAJOR 5
 #define VBOX_VERSION_MINOR 1
-#define VBOX_VERSION_BUILD 14
-#define VBOX_VERSION_STRING_RAW "5.1.14"
-#define VBOX_VERSION_STRING "5.1.14_Ubuntu"
+#define VBOX_VERSION_BUILD 16
+#define VBOX_VERSION_STRING_RAW "5.1.16"
+#define VBOX_VERSION_STRING "5.1.16_Ubuntu"
 #define VBOX_API_VERSION_STRING "5_1"
 
 #define VBOX_PRIVATE_BUILD_DESC "Private build by root"

diff --git a/ubuntu/vbox/vboxsf/regops.c b/ubuntu/vbox/vboxsf/regops.c
index 44b1f0f4db88cd77679195d2ab5be3b5c64ccfc5..3812462b623003c5dd4ccf85384a84a4299fc2cc 100644 (file)
--- a/ubuntu/vbox/vboxsf/regops.c
+++ b/ubuntu/vbox/vboxsf/regops.c
@@ -444,7 +444,9 @@ static int sf_reg_release(struct inode *inode, struct file *file)
     return 0;
 }
 
-#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)
+#elif LINUX_VERSION_CODE > KERNEL_VERSION(2, 6, 25)
 static int sf_reg_fault(struct vm_area_struct *vma, struct vm_fault *vmf)
 #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)
@@ -459,6 +461,9 @@ static struct page *sf_reg_nopage(struct vm_area_struct *vma, unsigned long vadd
     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);
@@ -539,7 +544,7 @@ static struct vm_operations_struct sf_vma_ops =
 #if LINUX_VERSION_CODE > KERNEL_VERSION(2, 6, 25)
     .fault = sf_reg_fault
 #else
-     .nopage = sf_reg_nopage
+    .nopage = sf_reg_nopage
 #endif
 };
 

diff --git a/ubuntu/vbox/vboxsf/revision-generated.h b/ubuntu/vbox/vboxsf/revision-generated.h
index 08332bc35af61b6f1c9d425847bdf23dfac3ed46..207b71f54a0ca734a3445dd548b0897c3ffc8074 100644 (file)
--- a/ubuntu/vbox/vboxsf/revision-generated.h
+++ b/ubuntu/vbox/vboxsf/revision-generated.h
@@ -1 +1 @@
-#define VBOX_SVN_REV 112924
+#define VBOX_SVN_REV 113841

diff --git a/ubuntu/vbox/vboxsf/utils.c b/ubuntu/vbox/vboxsf/utils.c
index b867c83dd3bc13a8999fd164bec7bff954ea69a2..22ff53036a52df245755db38dfbe8539bb91c641 100644 (file)
--- a/ubuntu/vbox/vboxsf/utils.c
+++ b/ubuntu/vbox/vboxsf/utils.c
@@ -290,9 +290,16 @@ sf_dentry_revalidate(struct dentry *dentry, int flags)
    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)
+# else
 int sf_getattr(struct vfsmount *mnt, struct dentry *dentry, struct kstat *kstat)
+# endif
 {
     int err;
+# if LINUX_VERSION_CODE >= KERNEL_VERSION(4, 11, 0)
+    struct dentry *dentry = path->dentry;
+# endif
 
     TRACE();
     err = sf_inode_revalidate(dentry);

diff --git a/ubuntu/vbox/vboxsf/version-generated.h b/ubuntu/vbox/vboxsf/version-generated.h
index 9279c48c8f68354aea71a8375631e3b45c8e57aa..a929383249580c347b6645eb3f7f17f2d1ac9465 100644 (file)
--- a/ubuntu/vbox/vboxsf/version-generated.h
+++ b/ubuntu/vbox/vboxsf/version-generated.h
@@ -3,9 +3,9 @@
 
 #define VBOX_VERSION_MAJOR 5
 #define VBOX_VERSION_MINOR 1
-#define VBOX_VERSION_BUILD 14
-#define VBOX_VERSION_STRING_RAW "5.1.14"
-#define VBOX_VERSION_STRING "5.1.14_Ubuntu"
+#define VBOX_VERSION_BUILD 16
+#define VBOX_VERSION_STRING_RAW "5.1.16"
+#define VBOX_VERSION_STRING "5.1.16_Ubuntu"
 #define VBOX_API_VERSION_STRING "5_1"
 
 #define VBOX_PRIVATE_BUILD_DESC "Private build by root"

diff --git a/ubuntu/vbox/vboxsf/vfsmod.c b/ubuntu/vbox/vboxsf/vfsmod.c
index 62d0b35fde47dce2dddce0a4db832b2bdc7a6b18..9bf9627c7216c62439d91898dfe0e75d4bcc9703 100644 (file)
--- a/ubuntu/vbox/vboxsf/vfsmod.c
+++ b/ubuntu/vbox/vboxsf/vfsmod.c
@@ -36,6 +36,9 @@
 MODULE_DESCRIPTION(VBOX_PRODUCT " VFS Module for Host File System Access");
 MODULE_AUTHOR(VBOX_VENDOR);
 MODULE_LICENSE("GPL");
+#ifdef MODULE_ALIAS_FS
+MODULE_ALIAS_FS("vboxsf");
+#endif   
 #ifdef MODULE_VERSION
 MODULE_VERSION(VBOX_VERSION_STRING " r" RT_XSTR(VBOX_SVN_REV));
 #endif

diff --git a/ubuntu/vbox/vboxsf/vfsmod.h b/ubuntu/vbox/vboxsf/vfsmod.h
index 9dd28b612310ad2bdbdc7ba5a100064e15f01e85..2f1220668271a0bd16d450c7ac92c1ff19f0d437 100644 (file)
--- a/ubuntu/vbox/vboxsf/vfsmod.h
+++ b/ubuntu/vbox/vboxsf/vfsmod.h
@@ -100,8 +100,13 @@ extern int  sf_stat(const char *caller, struct sf_glob_info *sf_g,
                     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)
+# 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 query_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,

diff --git a/ubuntu/vbox/vboxvideo/revision-generated.h b/ubuntu/vbox/vboxvideo/revision-generated.h
index 08332bc35af61b6f1c9d425847bdf23dfac3ed46..207b71f54a0ca734a3445dd548b0897c3ffc8074 100644 (file)
--- a/ubuntu/vbox/vboxvideo/revision-generated.h
+++ b/ubuntu/vbox/vboxvideo/revision-generated.h
@@ -1 +1 @@
-#define VBOX_SVN_REV 112924
+#define VBOX_SVN_REV 113841

diff --git a/ubuntu/vbox/vboxvideo/vbox_drv.h b/ubuntu/vbox/vboxvideo/vbox_drv.h
index ca22cef0216fea8579162da40727236aaa7532eb..f5a3a456e83055715083be463291ae779f521f1f 100644 (file)
--- a/ubuntu/vbox/vboxvideo/vbox_drv.h
+++ b/ubuntu/vbox/vboxvideo/vbox_drv.h
@@ -67,6 +67,9 @@
 #if LINUX_VERSION_CODE >= KERNEL_VERSION(3, 18, 0)
 # include <drm/drm_gem.h>
 #endif
+#if LINUX_VERSION_CODE >= KERNEL_VERSION(4, 11, 0)
+# include <drm/drm_encoder.h>
+#endif
 
 /* #include "vboxvideo.h" */
 
@@ -143,7 +146,11 @@ struct vbox_private {
 #undef CURSOR_DATA_SIZE
 
 int vbox_driver_load(struct drm_device *dev, unsigned long flags);
+#if LINUX_VERSION_CODE >= KERNEL_VERSION(4, 11, 0)
+void vbox_driver_unload(struct drm_device *dev);
+#else
 int vbox_driver_unload(struct drm_device *dev);
+#endif
 void vbox_driver_lastclose(struct drm_device *dev);
 
 struct vbox_gem_object;

diff --git a/ubuntu/vbox/vboxvideo/vbox_fb.c b/ubuntu/vbox/vboxvideo/vbox_fb.c
index 78da136248352a5cd6f8532945c9cf740012c65f..560db238242a61164a17710056ac135420d7347e 100644 (file)
--- a/ubuntu/vbox/vboxvideo/vbox_fb.c
+++ b/ubuntu/vbox/vboxvideo/vbox_fb.c
@@ -80,7 +80,11 @@ static void vbox_dirty_update(struct vbox_fbdev *fbdev,
     struct drm_gem_object *obj;
     struct vbox_bo *bo;
     int src_offset, dst_offset;
-    int bpp = (fbdev->afb.base.bits_per_pixel + 7)/8;
+#if LINUX_VERSION_CODE >= KERNEL_VERSION(4, 11, 0)
+    int bpp = fbdev->afb.base.format->cpp[0];
+#else
+    int bpp = (fbdev->afb.base.bits_per_pixel + 7) / 8;
+#endif
     int ret = -EBUSY;
     bool unmap = false;
     bool store_for_later = false;
@@ -350,7 +354,11 @@ static int vboxfb_create(struct drm_fb_helper *helper,
     info->apertures->ranges[0].base = pci_resource_start(dev->pdev, 0);
     info->apertures->ranges[0].size = pci_resource_len(dev->pdev, 0);
 
+#if LINUX_VERSION_CODE >= KERNEL_VERSION(4, 11, 0)
+    drm_fb_helper_fill_fix(info, fb->pitches[0], fb->format->depth);
+#else
     drm_fb_helper_fill_fix(info, fb->pitches[0], fb->depth);
+#endif
     drm_fb_helper_fill_var(info, &fbdev->helper, sizes->fb_width, sizes->fb_height);
 
     info->screen_base = sysram;
@@ -440,7 +448,11 @@ int vbox_fbdev_init(struct drm_device *dev)
 #else
     drm_fb_helper_prepare(dev, &fbdev->helper, &vbox_fb_helper_funcs);
 #endif
+#if LINUX_VERSION_CODE >= KERNEL_VERSION(4, 11, 0)
+    ret = drm_fb_helper_init(dev, &fbdev->helper, vbox->num_crtcs);
+#else
     ret = drm_fb_helper_init(dev, &fbdev->helper, vbox->num_crtcs, vbox->num_crtcs);
+#endif
     if (ret)
         goto free;
 

diff --git a/ubuntu/vbox/vboxvideo/vbox_main.c b/ubuntu/vbox/vboxvideo/vbox_main.c
index b85e09191fb47a3d7694482d1c0f23784ea03034..24bbedcc016a67a9ec3c89a446e7a12e14a8d400 100644 (file)
--- a/ubuntu/vbox/vboxvideo/vbox_main.c
+++ b/ubuntu/vbox/vboxvideo/vbox_main.c
@@ -178,7 +178,11 @@ int vbox_framebuffer_init(struct drm_device *dev,
 
     LogFunc(("vboxvideo: %d: dev=%p, vbox_fb=%p, obj=%p\n", __LINE__, dev,
              vbox_fb, obj));
+#if LINUX_VERSION_CODE >= KERNEL_VERSION(4, 11, 0)
+    drm_helper_mode_fill_fb_struct(dev, &vbox_fb->base, mode_cmd);
+#else
     drm_helper_mode_fill_fb_struct(&vbox_fb->base, mode_cmd);
+#endif
     vbox_fb->obj = obj;
     ret = drm_framebuffer_init(dev, &vbox_fb->base, &vbox_fb_funcs);
     if (ret) {
@@ -408,7 +412,11 @@ out_free:
     return ret;
 }
 
+#if LINUX_VERSION_CODE >= KERNEL_VERSION(4, 11, 0)
+void vbox_driver_unload(struct drm_device *dev)
+#else
 int vbox_driver_unload(struct drm_device *dev)
+#endif
 {
     struct vbox_private *vbox = dev->dev_private;
 
@@ -426,7 +434,9 @@ int vbox_driver_unload(struct drm_device *dev)
     kfree(vbox);
     dev->dev_private = NULL;
     LogFunc(("vboxvideo: %d\n", __LINE__));
+#if LINUX_VERSION_CODE < KERNEL_VERSION(4, 11, 0)
     return 0;
+#endif
 }
 
 /** @note this is described in the DRM framework documentation.  AST does not

diff --git a/ubuntu/vbox/vboxvideo/vbox_mode.c b/ubuntu/vbox/vboxvideo/vbox_mode.c
index ad8a717eaa97d6bd7a5d00654d9c4bb05be4fffd..62336ea0d5240fc0eca4acbfaf2b4be90d6b63e7 100644 (file)
--- a/ubuntu/vbox/vboxvideo/vbox_mode.c
+++ b/ubuntu/vbox/vboxvideo/vbox_mode.c
@@ -80,11 +80,15 @@ static void vbox_do_modeset(struct drm_crtc *crtc,
     width = mode->hdisplay ? mode->hdisplay : 640;
     height = mode->vdisplay ? mode->vdisplay : 480;
     crtc_id = vbox_crtc->crtc_id;
-    bpp = crtc->enabled ? CRTC_FB(crtc)->bits_per_pixel : 32;
-#if LINUX_VERSION_CODE < KERNEL_VERSION(3, 3, 0)
-    pitch = crtc->enabled ? CRTC_FB(crtc)->pitch : width * bpp / 8;
-#else
+#if LINUX_VERSION_CODE >= KERNEL_VERSION(4, 11, 0)
+    bpp   = crtc->enabled ? CRTC_FB(crtc)->format->cpp[0] * 8 : 32;
     pitch = crtc->enabled ? CRTC_FB(crtc)->pitches[0] : width * bpp / 8;
+#elif LINUX_VERSION_CODE >= KERNEL_VERSION(3, 3, 0)
+    bpp   = crtc->enabled ? CRTC_FB(crtc)->bits_per_pixel : 32;
+    pitch = crtc->enabled ? CRTC_FB(crtc)->pitches[0] : width * bpp / 8;
+#else
+    bpp   = crtc->enabled ? CRTC_FB(crtc)->bits_per_pixel : 32;
+    pitch = crtc->enabled ? CRTC_FB(crtc)->pitch : width * bpp / 8;
 #endif
     /* This is the old way of setting graphics modes.  It assumed one screen
      * and a frame-buffer at the start of video RAM.  On older versions of
@@ -95,7 +99,12 @@ static void vbox_do_modeset(struct drm_crtc *crtc,
         && vbox_crtc->fb_offset / pitch < 0xffff - crtc->y
         && vbox_crtc->fb_offset % (bpp / 8) == 0)
         VBoxVideoSetModeRegisters(width, height, pitch * 8 / bpp,
-                          CRTC_FB(crtc)->bits_per_pixel, 0,
+#if LINUX_VERSION_CODE >= KERNEL_VERSION(4, 11, 0)
+                          CRTC_FB(crtc)->format->cpp[0] * 8,
+#else
+                          CRTC_FB(crtc)->bits_per_pixel,
+#endif
+                          0,
                           vbox_crtc->fb_offset % pitch / bpp * 8 + crtc->x,
                           vbox_crtc->fb_offset / pitch + crtc->y);
     flags = VBVA_SCREEN_F_ACTIVE;

diff --git a/ubuntu/vbox/vboxvideo/vbox_ttm.c b/ubuntu/vbox/vboxvideo/vbox_ttm.c
index 0e23acdb7796e4734e06b7e22826e7343cbe4f87..57dd087530c3ed62eafd9c370c16ff5495e8a579 100644 (file)
--- a/ubuntu/vbox/vboxvideo/vbox_ttm.c
+++ b/ubuntu/vbox/vboxvideo/vbox_ttm.c
@@ -280,7 +280,7 @@ struct ttm_bo_driver vbox_bo_driver = {
     .verify_access = vbox_bo_verify_access,
     .io_mem_reserve = &vbox_ttm_io_mem_reserve,
     .io_mem_free = &vbox_ttm_io_mem_free,
-#if LINUX_VERSION_CODE >= KERNEL_VERSION(4, 7, 0)
+#if LINUX_VERSION_CODE >= KERNEL_VERSION(4, 7, 0) && LINUX_VERSION_CODE < KERNEL_VERSION(4, 11, 0)
     .lru_tail = &ttm_bo_default_lru_tail,
     .swap_lru_tail = &ttm_bo_default_swap_lru_tail,
 #endif

diff --git a/ubuntu/vbox/vboxvideo/version-generated.h b/ubuntu/vbox/vboxvideo/version-generated.h
index 9279c48c8f68354aea71a8375631e3b45c8e57aa..a929383249580c347b6645eb3f7f17f2d1ac9465 100644 (file)
--- a/ubuntu/vbox/vboxvideo/version-generated.h
+++ b/ubuntu/vbox/vboxvideo/version-generated.h
@@ -3,9 +3,9 @@
 
 #define VBOX_VERSION_MAJOR 5
 #define VBOX_VERSION_MINOR 1
-#define VBOX_VERSION_BUILD 14
-#define VBOX_VERSION_STRING_RAW "5.1.14"
-#define VBOX_VERSION_STRING "5.1.14_Ubuntu"
+#define VBOX_VERSION_BUILD 16
+#define VBOX_VERSION_STRING_RAW "5.1.16"
+#define VBOX_VERSION_STRING "5.1.16_Ubuntu"
 #define VBOX_API_VERSION_STRING "5_1"
 
 #define VBOX_PRIVATE_BUILD_DESC "Private build by root"