Changeset 76939 in vbox

Timestamp:

Jan 22, 2019 4:51:28 PM (6 years ago)

Author:

vboxsync

Message:

Reverted previous commit: merged too much.

Location:

trunk/src/VBox

Files:

• Additions/linux/drm/vbox_fb.c (modified) (1 diff)
• Additions/linux/drm/vbox_main.c (modified) (1 diff)
• Additions/linux/sharedfolders/lnkops.c (modified) (2 diffs)
• Additions/linux/sharedfolders/utils.c (modified) (1 diff)
• Installer/linux/uninstall.sh (modified) (2 diffs)
• Installer/solaris/makepackage.sh (modified) (1 diff)
• ValidationKit/testdriver/base.py (modified) (1 diff)
• ValidationKit/tests/additions/tdAddLinux1.py (deleted)

trunk/src/VBox/Additions/linux/drm/vbox_fb.c

@@ -344 +344 @@
                                sizes->fb_height);
 
-        info->screen_base = (char __iomem *)bo->kmap.virtual;
+        info->screen_base = bo->kmap.virtual;
         info->screen_size = size;
 

trunk/src/VBox/Additions/linux/drm/vbox_main.c

@@ -68 +68 @@
                         continue;
 
-                vbva = (void __force *)vbox->vbva_buffers + i * VBVA_MIN_BUFFER_SIZE;
+                vbva = (void *)vbox->vbva_buffers + i * VBVA_MIN_BUFFER_SIZE;
                 if (!VBoxVBVAEnable(&vbox->vbva_info[i],
                                  vbox->guest_pool, vbva, i)) {

trunk/src/VBox/Additions/linux/sharedfolders/lnkops.c

@@ -36 +36 @@
 #  if LINUX_VERSION_CODE >= KERNEL_VERSION(4, 2, 0)
 static const char *sf_follow_link(struct dentry *dentry, void **cookie)
-#elif LINUX_VERSION_CODE >= KERNEL_VERSION(2, 6, 13)
+#  else
 static void *sf_follow_link(struct dentry *dentry, struct nameidata *nd)
-#else
-static int sf_follow_link(struct dentry *dentry, struct nameidata *nd)
 #  endif
 {
@@ -63 +61 @@
 #  else
         nd_set_link(nd, error ? ERR_PTR(error) : path);
-# if LINUX_VERSION_CODE >= KERNEL_VERSION(2, 6, 13)
         return NULL;
-# else
-        return 0;
-# endif
-#endif
+#  endif
 }
 
 #  if LINUX_VERSION_CODE < KERNEL_VERSION(4, 2, 0)
-# if LINUX_VERSION_CODE >= KERNEL_VERSION(2, 6, 13)
 static void sf_put_link(struct dentry *dentry, struct nameidata *nd,
                         void *cookie)
-#else
-static void sf_put_link(struct dentry *dentry, struct nameidata *nd)
-#endif
 {
         char *page = nd_get_link(nd);

trunk/src/VBox/Additions/linux/sharedfolders/utils.c

@@ -853 +853 @@
         /* Each new shared folder map gets a new uint64_t identifier,
          * allocated in sequence.  We ASSUME the sequence will not wrap. */
-#if LINUX_VERSION_CODE >= KERNEL_VERSION(2, 6, 26)
         static uint64_t s_u64Sequence = 0;
         uint64_t u64CurrentSequence = ASMAtomicIncU64(&s_u64Sequence);
-#endif
 
         sf_g->bdi.ra_pages = 0; /* No readahead */

trunk/src/VBox/Installer/linux/uninstall.sh

@@ -66 +66 @@
 rm -f \
   /usr/bin/VirtualBox \
-  /usr/bin/VirtualBoxVM \
   /usr/bin/VBoxManage \
   /usr/bin/VBoxSDL \
@@ -83 +82 @@
   /usr/bin/VBoxTunctl \
   /usr/bin/virtualbox \
-  /usr/bin/virtualboxvm \
   /usr/share/pixmaps/VBox.png \
   /usr/share/pixmaps/virtualbox.png \

trunk/src/VBox/Installer/solaris/makepackage.sh

@@ -127 +127 @@
 create_hardlink VBoxTestOGL
 create_hardlink VirtualBox
-create_hardlink VirtualBoxVM
 create_hardlink vbox-img
 create_hardlink VBoxHeadless

trunk/src/VBox/ValidationKit/testdriver/base.py

@@ -831 +831 @@
             if self.sHost == 'darwin':      self.sResourcePath = "/Volumes/testrsrc/";
             elif self.sHost == 'freebsd':   self.sResourcePath = "/mnt/testrsrc/";
-            elif self.sHost == 'linux':
-                self.sResourcePath = "/mnt/testrsrc/";
-                if not os.path.isdir(self.sResourcePath) and utils.isRunningFromCheckout():
-                    self.sResourcePath = os.path.join(g_ksValidationKitDir, os.pardir, os.pardir, os.pardir, "testrsrc");
+            elif self.sHost == 'linux':     self.sResourcePath = "/mnt/testrsrc/";
             elif self.sHost == 'os2':       self.sResourcePath = "T:/";
             elif self.sHost == 'solaris':   self.sResourcePath = "/mnt/testrsrc/";
             elif self.sHost == 'win':       self.sResourcePath = "T:/";
             else: raise GenError('unknown host OS "%s"' % (self.sHost));
-        assert os.path.isdir(self.sResourcePath), 'Resource path not found: self.sResourcePath="%s"' % (self.sResourcePath);
 
         # PID file for the testdriver.