[gentoo-commits] gentoo-x86 commit in app-emulation/vmware-modules/files: 1.0.0.20-vmblock-2.6.26-1.patch 1.0.0.20-vmnet-2.6.26.patch 1.0.0.22-makefile-kernel-dir.patch 1.0.0.20-vmmon-2.6.26.patch 1.0.0.20-vmblock-2.6.26-2.patch

[Mike Auty (ikelos)]

ikelos      08/09/30 14:44:29

  Added:                1.0.0.20-vmblock-2.6.26-1.patch
                        1.0.0.20-vmnet-2.6.26.patch
                        1.0.0.22-makefile-kernel-dir.patch
                        1.0.0.20-vmmon-2.6.26.patch
                        1.0.0.20-vmblock-2.6.26-2.patch
  Log:
  Remove old unused versions, fix up 1.0.0.20 bugs and put in a new version
  for workstation 6.0.5 and player 2.0.5.
  (Portage version: 2.2_rc11/cvs/Linux 2.6.26-gentoo-r1 i686)

Revision  Changes    Path
1.1                  app-emulation/vmware-modules/files/1.0.0.20-vmblock-2.6.26-1.patch

file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/app-emulation/vmware-modules/files/1.0.0.20-vmblock-2.6.26-1.patch?rev=1.1&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/app-emulation/vmware-modules/files/1.0.0.20-vmblock-2.6.26-1.patch?rev=1.1&content-type=text/plain

Index: 1.0.0.20-vmblock-2.6.26-1.patch
===================================================================
--- vmblock-only/linux/vmblockInt.h       2008-08-07 20:56:05.000000000 +0200
+++ vmblock-only/linux/vmblockInt.h       2008-08-07 21:00:10.000000000 +0200
@@ -50,7 +50,16 @@
 #endif /* __KERNEL__ */

 #define VMBLOCK_CONTROL_MODE       S_IRUSR | S_IFREG
-#define VMBLOCK_CONTROL_PARENT     proc_root_fs
+/*
+ * constants like proc_root_fs has been removed from proc_fs.h
+ * since kernel 2.6.26. We have to replace it by NULL and use
+ * full path : to create /proc/fs/wonderful => use fs/wonderful
+ */
+#if LINUX_VERSION_CODE < KERNEL_VERSION(2, 6, 26)
+#  define VMBLOCK_CONTROL_PARENT     proc_root_fs
+#else
+#  define VMBLOCK_CONTROL_PARENT     NULL
+#endif

 /*
  * Our modules may be compatible with kernels built for different processors.
--- vmblock-only/include/vmblock.h        2008-05-16 07:59:29.000000000 +0200
+++ vmblock-only/include/vmblock.h        2008-08-07 21:09:13.000000000 +0200
@@ -14,9 +14,16 @@
 #ifdef sun
 # include <sys/ioccom.h>
 #endif
-
-#define VMBLOCK_FS_NAME                "vmblock"
-
+/*
+ * constants like proc_root_fs has been removed from proc_fs.h
+ * since kernel 2.6.26. We have to replace it by NULL and use
+ * full path : to create /proc/fs/wonderful => use fs/wonderful
+ */
+#if LINUX_VERSION_CODE < KERNEL_VERSION(2, 6, 26)
+# define VMBLOCK_FS_NAME                "vmblock"
+#else
+# define VMBLOCK_FS_NAME                "fs/vmblock"
+#endif
 /* Commands for the control half of vmblock driver */
 #if defined(linux)
 # define VMBLOCK_ADD_FILEBLOCK          98




1.1                  app-emulation/vmware-modules/files/1.0.0.20-vmnet-2.6.26.patch

file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/app-emulation/vmware-modules/files/1.0.0.20-vmnet-2.6.26.patch?rev=1.1&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/app-emulation/vmware-modules/files/1.0.0.20-vmnet-2.6.26.patch?rev=1.1&content-type=text/plain

Index: 1.0.0.20-vmnet-2.6.26.patch
===================================================================
--- ./vmnet-only/bridge.c	2008-05-16 07:59:28.000000000 +0200
+++ ./vmnet-only/bridge.c	2008-08-07 22:12:50.000000000 +0200
@@ -275,8 +275,12 @@
                         struct net_device *net)  // IN: Network device
 {
 #ifdef VMW_NETDEV_HAS_NET
+# if LINUX_VERSION_CODE < KERNEL_VERSION(2, 6, 26)
    if (net->nd_net != bridge->internalDev->nd_net) {
-      return 0;
+# else
+   if (dev_net(net) != dev_net(bridge->internalDev)) {
+# endif 
+     return 0;
    }
 #endif
    return strcmp(net->name, bridge->name) == 0;
--- ./vmnet-only/procfs.c	2008-05-16 07:59:28.000000000 +0200
+++ ./vmnet-only/procfs.c	2008-08-07 22:15:58.000000000 +0200
@@ -63,7 +63,11 @@
 {
    int retval;
 
+#if LINUX_VERSION_CODE < KERNEL_VERSION(2, 6, 26)
    retval = VNetProc_MakeEntry(&proc_root, "vmnet", S_IFDIR, &base);
+#else
+   retval = VNetProc_MakeEntry(NULL, "vmnet", S_IFDIR, &base);
+#endif
    if (retval) {
       return retval;
    }
@@ -95,7 +99,11 @@
 void
 VNetProc_Cleanup(void)
 {
+#if LINUX_VERSION_CODE < KERNEL_VERSION(2, 6, 26)
    VNetProc_RemoveEntry(base, &proc_root);
+#else
+   VNetProc_RemoveEntry(base, NULL);
+#endif
    base = NULL;
 }
 
--- ./vmnet-only/vmnetInt.h	2008-05-16 07:59:28.000000000 +0200
+++ ./vmnet-only/vmnetInt.h	2008-08-07 22:20:13.000000000 +0200
@@ -63,7 +63,11 @@
 #   define dev_lock_list()    read_lock(&dev_base_lock)
 #   define dev_unlock_list()  read_unlock(&dev_base_lock)
 #   ifdef VMW_NETDEV_HAS_NET
+#     if LINUX_VERSION_CODE < KERNEL_VERSION(2, 6, 26)
 #      define DEV_GET(x)      __dev_get_by_name((x)->internalDev->nd_net, (x)->name)
+#     else
+#      define DEV_GET(x)      __dev_get_by_name(dev_net((x)->internalDev), (x)->name)
+#     endif
 #   else
 #      define DEV_GET(x)      __dev_get_by_name((x)->name)
 #   endif
@@ -89,8 +93,13 @@
 
 #ifdef VMW_NETDEV_HAS_NET
 extern struct proto vmnet_proto;
+# if LINUX_VERSION_CODE < KERNEL_VERSION(2, 6, 26)
 #   define compat_sk_alloc(_bri, _pri) sk_alloc((_bri)->internalDev->nd_net, \
                                                 PF_NETLINK, _pri, &vmnet_proto)
+# else
+#  define compat_sk_alloc(_bri, _pri) sk_alloc(dev_net((_bri)->internalDev), \
+                                                 PF_NETLINK, _pri, &vmnet_proto)
+# endif
 #elif defined(VMW_HAVE_SK_ALLOC_WITH_PROTO)
 extern struct proto vmnet_proto;
 #   define compat_sk_alloc(_bri, _pri) sk_alloc(PF_NETLINK, _pri, &vmnet_proto, 1)



1.1                  app-emulation/vmware-modules/files/1.0.0.22-makefile-kernel-dir.patch

file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/app-emulation/vmware-modules/files/1.0.0.22-makefile-kernel-dir.patch?rev=1.1&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/app-emulation/vmware-modules/files/1.0.0.22-makefile-kernel-dir.patch?rev=1.1&content-type=text/plain

Index: 1.0.0.22-makefile-kernel-dir.patch
===================================================================
diff --git a/vmblock-only/Makefile b/vmblock-only/Makefile
index e7d18b5..02e2cf3 100644
--- a/vmblock-only/Makefile
+++ b/vmblock-only/Makefile
@@ -14,9 +14,9 @@ SRCROOT = .
 VM_UNAME = $(shell uname -r)
 
 # Header directory for the running kernel
-HEADER_DIR = /lib/modules/$(VM_UNAME)/build/include
+HEADER_DIR = $(KERNEL_DIR) 
 
-BUILD_DIR = $(HEADER_DIR)/..
+BUILD_DIR = $(KBUILD_OUTPUT)
 
 DRIVER := vmblock
 
diff --git a/vmmon-only/Makefile b/vmmon-only/Makefile
index 1707ffc..165da0a 100644
--- a/vmmon-only/Makefile
+++ b/vmmon-only/Makefile
@@ -14,9 +14,9 @@ SRCROOT = .
 VM_UNAME = $(shell uname -r)
 
 # Header directory for the running kernel
-HEADER_DIR = /lib/modules/$(VM_UNAME)/build/include
+HEADER_DIR = $(KERNEL_DIR)
 
-BUILD_DIR = $(HEADER_DIR)/..
+BUILD_DIR = $(KBUILD_OUTPUT)
 
 DRIVER := vmmon
 
diff --git a/vmnet-only/Makefile b/vmnet-only/Makefile
index cd24c8c..a085f96 100644
--- a/vmnet-only/Makefile
+++ b/vmnet-only/Makefile
@@ -14,9 +14,9 @@ SRCROOT = .
 VM_UNAME = $(shell uname -r)
 
 # Header directory for the running kernel
-HEADER_DIR = /lib/modules/$(VM_UNAME)/build/include
+HEADER_DIR = $(KERNEL_DIR)
 
-BUILD_DIR = $(HEADER_DIR)/..
+BUILD_DIR = $(KBUILD_OUTPUT)
 
 DRIVER := vmnet
 



1.1                  app-emulation/vmware-modules/files/1.0.0.20-vmmon-2.6.26.patch

file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/app-emulation/vmware-modules/files/1.0.0.20-vmmon-2.6.26.patch?rev=1.1&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/app-emulation/vmware-modules/files/1.0.0.20-vmmon-2.6.26.patch?rev=1.1&content-type=text/plain

Index: 1.0.0.20-vmmon-2.6.26.patch
===================================================================
--- vmmon-only/linux/driver.c	2008-08-07 22:04:50.000000000 +0200
+++ vmmon-only/linux/driver.c	2008-08-07 22:06:57.000000000 +0200
@@ -23,7 +23,9 @@
 #include <linux/smp_lock.h>
 
 #include <linux/poll.h>
-
+#if LINUX_VERSION_CODE >= KERNEL_VERSION(2, 6, 26)
+# include <linux/mm.h>
+#endif
 /*
  * Power Management: hook resume to work around
  * BIOS bugs where VT is not properly enabled after S4
@@ -179,23 +181,32 @@
 
 static int LinuxDriver_Close(struct inode *inode, struct file *filp);
 static unsigned int LinuxDriverPoll(struct file *file, poll_table *wait);
-#if defined(VMW_NOPAGE_261)
+#if LINUX_VERSION_CODE < KERNEL_VERSION(2, 6, 26)
+# if defined(VMW_NOPAGE_261)
 static struct page *LinuxDriverNoPage(struct vm_area_struct *vma,
                            unsigned long address, int *type);
-#elif defined(KERNEL_2_4_0)
+# elif defined(KERNEL_2_4_0)
 static struct page *LinuxDriverNoPage(struct vm_area_struct *vma,
 			   unsigned long address, int unused);
-#else
+# else
 static unsigned long LinuxDriverNoPage(struct vm_area_struct *vma,
 			   unsigned long address, int write_access);
-#endif
-static int LinuxDriverMmap(struct file *filp, struct vm_area_struct *vma);
-
-static void LinuxDriverPollTimeout(unsigned long clientData);
+# endif
 
 static struct vm_operations_struct vmuser_mops = {
 	.nopage = LinuxDriverNoPage
 };
+#else
+static int LinuxDriverNoPage(struct vm_area_struct *vma,
+                          struct vm_fault *fdata);
+
+static struct vm_operations_struct vmuser_mops = {
+       .fault = LinuxDriverNoPage
+};
+#endif
+static int LinuxDriverMmap(struct file *filp, struct vm_area_struct *vma);
+
+static void LinuxDriverPollTimeout(unsigned long clientData);
 
 static struct file_operations vmuser_fops;
 static struct timer_list tscTimer;
@@ -1172,20 +1183,20 @@
  *
  *-----------------------------------------------------------------------------
  */
-
-#ifdef VMW_NOPAGE_261
+#if LINUX_VERSION_CODE < KERNEL_VERSION(2, 6, 26)
+# ifdef VMW_NOPAGE_261
 static struct page *LinuxDriverNoPage(struct vm_area_struct *vma, //IN
 				      unsigned long address, 	  //IN
 				      int *type)		  //OUT: Fault type
-#elif defined(KERNEL_2_4_0)
+# elif defined(KERNEL_2_4_0)
 static struct page *LinuxDriverNoPage(struct vm_area_struct *vma, //IN
 				      unsigned long address, 	  //IN
 				      int unused)		  //nothing
-#else
+# else
 static unsigned long LinuxDriverNoPage(struct vm_area_struct *vma,//IN
 				       unsigned long address,	  //IN
 				       int write_access)	  //IN
-#endif
+# endif
 {
 	VMLinux *vmLinux = (VMLinux *) vma->vm_file->private_data;
 	unsigned long pg;
@@ -1198,15 +1209,37 @@
 	}
 	page = vmLinux->pages4Gb[pg];
 	get_page(page);
-#ifdef KERNEL_2_4_0
-#ifdef VMW_NOPAGE_261
+# ifdef KERNEL_2_4_0
+#  ifdef VMW_NOPAGE_261
         *type = VM_FAULT_MINOR;
-#endif
+#  endif
 	return page;
-#else
+# else
 	return page_address(page);
-#endif
+# endif
+}
+#else
+/*  For kernel upper or equal to  2.6.26 */
+static int LinuxDriverNoPage(struct vm_area_struct *vma,
+                          struct vm_fault *fdata)
+{
+       VMLinux *vmLinux = (VMLinux *) vma->vm_file->private_data;
+       unsigned long pg;
+       struct page* page;
+
+       pg = fdata->pgoff;
+       pg = VMMON_MAP_OFFSET(pg);
+       if (pg >= vmLinux->size4Gb) {
+               return VM_FAULT_MAJOR;
+       }
+       page = vmLinux->pages4Gb[pg];
+       get_page(page);
+       fdata->page = page;
+        return VM_FAULT_MINOR;
 }
+#endif
+
+
 
 
 /*



1.1                  app-emulation/vmware-modules/files/1.0.0.20-vmblock-2.6.26-2.patch

file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/app-emulation/vmware-modules/files/1.0.0.20-vmblock-2.6.26-2.patch?rev=1.1&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/app-emulation/vmware-modules/files/1.0.0.20-vmblock-2.6.26-2.patch?rev=1.1&content-type=text/plain

Index: 1.0.0.20-vmblock-2.6.26-2.patch
===================================================================
--- vmblock-only/linux/filesystem.c	2008-08-08 15:27:46.000000000 +0200
+++ vmblock-only/linux/filesystem.c	2008-08-08 18:34:57.000000000 +0200
@@ -64,7 +64,11 @@ static char const *fsRoot;
 static size_t fsRootLen;
 static struct file_system_type fsType = {
    .owner = THIS_MODULE,
+#if LINUX_VERSION_CODE < KERNEL_VERSION(2, 6, 26)
    .name = VMBLOCK_FS_NAME,
+#else
+   .name = VMBLOCK_FS_NAME_I,
+#endif
 #if KERNEL_25_FS
    .get_sb = FsOpGetSb,
    .kill_sb = kill_anon_super,
@@ -506,8 +510,11 @@ FsOpReadSuper(struct super_block *sb, //
    rootInode->i_op = &RootInodeOps;
    rootInode->i_fop = &RootFileOps;
    rootInode->i_mode = S_IFDIR | S_IRUGO | S_IXUGO;
-
+#if LINUX_VERSION_CODE < KERNEL_VERSION(2, 6, 26)
    LOG(4, "%s file system mounted\n", VMBLOCK_FS_NAME);
+#else
+   LOG(4, "%s file system mounted\n", VMBLOCK_FS_NAME_I);
+#endif
    return 0;
 }
 
--- vmblock-only/include/vmblock.h	2008-08-08 15:27:46.000000000 +0200
+++ vmblock-only/include/vmblock.h	2008-08-08 18:37:45.000000000 +0200
@@ -22,7 +22,8 @@
 #if LINUX_VERSION_CODE < KERNEL_VERSION(2, 6, 26)
 # define VMBLOCK_FS_NAME                "vmblock"
 #else
-# define VMBLOCK_FS_NAME                "fs/vmblock"
+# define VMBLOCK_FS_NAME_I              "vmblock"
+# define VMBLOCK_FS_NAME                "fs/" VMBLOCK_FS_NAME_I
 #endif
 /* Commands for the control half of vmblock driver */
 #if defined(linux)
@@ -53,7 +54,11 @@
 # ifdef VMX86_DEVEL
 #  define VMBLOCK_LIST_FILEBLOCKS       _IO('v', 3)
 # endif
-# define VMBLOCK_MOUNT_POINT            "/var/run/" VMBLOCK_FS_NAME
+# if LINUX_VERSION_CODE < KERNEL_VERSION(2, 6, 26)
+#   define VMBLOCK_MOUNT_POINT            "/var/run/" VMBLOCK_FS_NAME
+# else
+#   define VMBLOCK_MOUNT_POINT            "/var/run/" VMBLOCK_FS_NAME_I
+#endif
 # define VMBLOCK_DEVICE                 VMBLOCK_MOUNT_POINT
 # define VMBLOCK_DEVICE_MODE            O_RDONLY
 # define VMBLOCK_CONTROL(fd, op, path)  ioctl(fd, op, path)