commit: 10ad4083b2d0209d4ed333a23fa1ef6b5851b8a3
Author: Evan Teran <evan.teran <AT> gmail <DOT> com>
AuthorDate: Thu Oct 9 21:09:30 2014 +0000
Commit: Evan Teran <evan.teran <AT> gmail <DOT> com>
CommitDate: Thu Oct 9 21:09:30 2014 +0000
URL:
http://sources.gentoo.org/gitweb/?p=proj/vmware.git;a=commit;h=10ad4083
now properly compiles with minimal wanrings for 3.10, moving onto 3.11 testing
:-)
---
.../files/271-3.10-04-unused-typedef.patch | 112 +++++++++++++++++++++
.../vmware-modules/files/271-3.10-05-dentry.patch | 30 ++++++
.../vmware-modules/files/271-3.10-06-inode.patch | 31 ++++++
.../vmware-modules/files/271-3.10-07-hub.patch | 21 ++++
4 files changed, 194 insertions(+)
diff --git
a/app-emulation/vmware-modules/files/271-3.10-04-unused-typedef.patch
b/app-emulation/vmware-modules/files/271-3.10-04-unused-typedef.patch
new file mode 100644
index 0000000..d030110
--- /dev/null
+++ b/app-emulation/vmware-modules/files/271-3.10-04-unused-typedef.patch
@@ -0,0 +1,112 @@
+--- vmblock-only/shared/vm_assert.h 2014-10-07 22:43:39.519402467 -0400
++++ vmblock-only/shared/vm_assert.h 2014-10-07 22:48:01.346409957 -0400
+@@ -317,7 +317,7 @@ EXTERN void WarningThrottled(uint32 *cou
+ #define ASSERT_ON_COMPILE(e) \
+ do { \
+ enum { AssertOnCompileMisused = ((e) ? 1 : -1) }; \
+- typedef char AssertOnCompileFailed[AssertOnCompileMisused]; \
++ __attribute__((unused)) typedef char
AssertOnCompileFailed[AssertOnCompileMisused]; \
+ } while (0)
+
+
+--- vmci-only/shared/vm_assert.h 2014-10-07 22:43:39.519402467 -0400
++++ vmci-only/shared/vm_assert.h 2014-10-07 22:47:51.829409685 -0400
+@@ -317,7 +317,7 @@ EXTERN void WarningThrottled(uint32 *cou
+ #define ASSERT_ON_COMPILE(e) \
+ do { \
+ enum { AssertOnCompileMisused = ((e) ? 1 : -1) }; \
+- typedef char AssertOnCompileFailed[AssertOnCompileMisused]; \
++ __attribute__((unused)) typedef char
AssertOnCompileFailed[AssertOnCompileMisused]; \
+ } while (0)
+
+
+--- vmmon-only/include/vm_assert.h 2014-10-07 22:43:39.520402467 -0400
++++ vmmon-only/include/vm_assert.h 2014-10-07 22:47:39.246409325 -0400
+@@ -317,7 +317,7 @@ EXTERN void WarningThrottled(uint32 *cou
+ #define ASSERT_ON_COMPILE(e) \
+ do { \
+ enum { AssertOnCompileMisused = ((e) ? 1 : -1) }; \
+- typedef char AssertOnCompileFailed[AssertOnCompileMisused]; \
++ __attribute__((unused)) typedef char
AssertOnCompileFailed[AssertOnCompileMisused]; \
+ } while (0)
+
+
+--- vmnet-only/vm_assert.h 2014-10-07 22:43:39.520402467 -0400
++++ vmnet-only/vm_assert.h 2014-10-07 22:47:55.804409799 -0400
+@@ -317,7 +317,7 @@ EXTERN void WarningThrottled(uint32 *cou
+ #define ASSERT_ON_COMPILE(e) \
+ do { \
+ enum { AssertOnCompileMisused = ((e) ? 1 : -1) }; \
+- typedef char AssertOnCompileFailed[AssertOnCompileMisused]; \
++ __attribute__((unused)) typedef char
AssertOnCompileFailed[AssertOnCompileMisused]; \
+ } while (0)
+
+
+--- vsock-only/shared/vm_assert.h 2014-10-07 22:47:11.595408534 -0400
++++ vsock-only/shared/vm_assert.h 2014-10-07 22:45:55.715406363 -0400
+@@ -317,7 +317,7 @@ EXTERN void WarningThrottled(uint32 *cou
+ #define ASSERT_ON_COMPILE(e) \
+ do { \
+ enum { AssertOnCompileMisused = ((e) ? 1 : -1) }; \
+- typedef char AssertOnCompileFailed[AssertOnCompileMisused]; \
++ __attribute__((unused)) typedef char
AssertOnCompileFailed[AssertOnCompileMisused]; \
+ } while (0)
+
+
+--- vsock-only/shared/vm_atomic.h 2013-11-05 23:33:27.000000000 -0500
++++ vsock-only/shared/vm_atomic.h 2014-10-07 22:53:06.024418673 -0400
+@@ -2394,7 +2394,7 @@ Atomic_TestBit64(Atomic_uint64 *var, //
+ && 8 * sizeof (out) == size
\
+ && 8 * sizeof (cast) == size
\
+ ? 1 : -1 };
\
+- typedef char AssertOnCompileFailed[AssertOnCompileMisused];
\
++ __attribute__((unused)) typedef char
AssertOnCompileFailed[AssertOnCompileMisused]; \
+ }
\
+
\
+
\
+--- vmci-only/shared/vm_atomic.h 2013-11-05 23:33:27.000000000 -0500
++++ vmci-only/shared/vm_atomic.h 2014-10-07 22:53:24.873419213 -0400
+@@ -2394,7 +2394,7 @@ Atomic_TestBit64(Atomic_uint64 *var, //
+ && 8 * sizeof (out) == size
\
+ && 8 * sizeof (cast) == size
\
+ ? 1 : -1 };
\
+- typedef char AssertOnCompileFailed[AssertOnCompileMisused];
\
++ __attribute__((unused)) typedef char
AssertOnCompileFailed[AssertOnCompileMisused]; \
+ }
\
+
\
+
\
+
+--- vmblock-only/shared/vm_atomic.h 2013-11-05 23:33:27.000000000 -0500
++++ vmblock-only/shared/vm_atomic.h 2014-10-07 22:53:31.073419390 -0400
+@@ -2394,7 +2394,7 @@ Atomic_TestBit64(Atomic_uint64 *var, //
+ && 8 * sizeof (out) == size
\
+ && 8 * sizeof (cast) == size
\
+ ? 1 : -1 };
\
+- typedef char AssertOnCompileFailed[AssertOnCompileMisused];
\
++ __attribute__((unused)) typedef char
AssertOnCompileFailed[AssertOnCompileMisused]; \
+ }
\
+
\
+
+--- vmnet-only/vm_atomic.h 2013-11-06 00:40:52.000000000 -0500
++++ vmnet-only/vm_atomic.h 2014-10-07 23:04:50.637438831 -0400
+@@ -2394,7 +2394,7 @@ Atomic_TestBit64(Atomic_uint64 *var, //
+ && 8 * sizeof (out) == size
\
+ && 8 * sizeof (cast) == size
\
+ ? 1 : -1 };
\
+- typedef char AssertOnCompileFailed[AssertOnCompileMisused];
\
++ __attribute__((unused)) typedef char
AssertOnCompileFailed[AssertOnCompileMisused]; \
+ }
\
+
\
+
\
+
+--- vmmon-only/include/vm_atomic.h 2013-11-06 00:40:52.000000000 -0500
++++ vmmon-only/include/vm_atomic.h 2014-10-07 23:04:50.637438831 -0400
+@@ -2394,7 +2394,7 @@ Atomic_TestBit64(Atomic_uint64 *var, //
+ && 8 * sizeof (out) == size
\
+ && 8 * sizeof (cast) == size
\
+ ? 1 : -1 };
\
+- typedef char AssertOnCompileFailed[AssertOnCompileMisused];
\
++ __attribute__((unused)) typedef char
AssertOnCompileFailed[AssertOnCompileMisused]; \
+ }
\
+
\
+
\
diff --git a/app-emulation/vmware-modules/files/271-3.10-05-dentry.patch
b/app-emulation/vmware-modules/files/271-3.10-05-dentry.patch
new file mode 100644
index 0000000..8acecf5
--- /dev/null
+++ b/app-emulation/vmware-modules/files/271-3.10-05-dentry.patch
@@ -0,0 +1,30 @@
+diff -Naur vmblock-only/linux/dentry.c vmblock-only/linux/dentry.c
+--- vmblock-only/linux/dentry.c 2013-11-05 23:33:26.000000000 -0500
++++ vmblock-only/linux/dentry.c 2014-04-26 10:58:03.062635343 -0400
+@@ -32,7 +32,7 @@
+ #include "block.h"
+
+
+-static int DentryOpRevalidate(struct dentry *dentry, struct nameidata *nd);
++static int DentryOpRevalidate(struct dentry *dentry, unsigned int flags);
+
+ struct dentry_operations LinkDentryOps = {
+ .d_revalidate = DentryOpRevalidate,
+@@ -60,7 +60,7 @@
+
+ static int
+ DentryOpRevalidate(struct dentry *dentry, // IN: dentry revalidating
+- struct nameidata *nd) // IN: lookup flags & intent
++ unsigned int flags) // IN: lookup flags & intent
+ {
+ VMBlockInodeInfo *iinfo;
+ struct nameidata actualNd;
+@@ -101,7 +101,7 @@
+ if (actualDentry &&
+ actualDentry->d_op &&
+ actualDentry->d_op->d_revalidate) {
+- return actualDentry->d_op->d_revalidate(actualDentry, nd);
++ return actualDentry->d_op->d_revalidate(actualDentry, flags);
+ }
+
+ if (compat_path_lookup(iinfo->name, 0, &actualNd)) {
diff --git a/app-emulation/vmware-modules/files/271-3.10-06-inode.patch
b/app-emulation/vmware-modules/files/271-3.10-06-inode.patch
new file mode 100644
index 0000000..0d30dbe
--- /dev/null
+++ b/app-emulation/vmware-modules/files/271-3.10-06-inode.patch
@@ -0,0 +1,31 @@
+diff -Naur vmblock-only/linux/inode.c vmblock-only/linux/inode.c
+--- vmblock-only/linux/inode.c 2013-11-05 23:33:26.000000000 -0500
++++ vmblock-only/linux/inode.c 2014-04-26 10:58:03.063635343 -0400
+@@ -36,7 +36,7 @@
+
+ /* Inode operations */
+ static struct dentry *InodeOpLookup(struct inode *dir,
+- struct dentry *dentry, struct nameidata
*nd);
++ struct dentry *dentry, unsigned int
flags);
+ static int InodeOpReadlink(struct dentry *dentry, char __user *buffer, int
buflen);
+ #if LINUX_VERSION_CODE >= KERNEL_VERSION(2, 6, 13)
+ static void *InodeOpFollowlink(struct dentry *dentry, struct nameidata *nd);
+@@ -75,7 +75,7 @@
+ static struct dentry *
+ InodeOpLookup(struct inode *dir, // IN: parent directory's inode
+ struct dentry *dentry, // IN: dentry to lookup
+- struct nameidata *nd) // IN: lookup intent and information
++ unsigned int flags) // IN: lookup intent and information
+ {
+ char *filename;
+ struct inode *inode;
+@@ -221,7 +221,8 @@
+ goto out;
+ }
+
+- ret = vfs_follow_link(nd, iinfo->name);
++ nd_set_link(nd, iinfo->name);
++ ret = 0;
+
+ out:
+ #if LINUX_VERSION_CODE >= KERNEL_VERSION(2, 6, 13)
diff --git a/app-emulation/vmware-modules/files/271-3.10-07-hub.patch
b/app-emulation/vmware-modules/files/271-3.10-07-hub.patch
new file mode 100644
index 0000000..50ab341
--- /dev/null
+++ b/app-emulation/vmware-modules/files/271-3.10-07-hub.patch
@@ -0,0 +1,21 @@
+diff -rupN vmnet-only/hub.c vmnet-only.new/hub.c
+--- vmnet-only/hub.c 2013-11-06 00:40:52.000000000 -0500
++++ vmnet-only.new/hub.c 2014-10-07 18:45:34.403918680 -0400
+@@ -129,7 +129,7 @@ VNetHubFindHubByID(uint8 idNum[VNET_PVN_
+ {
+ VNetHub *currHub = vnetHub;
+ while (currHub && (currHub->hubType != HUB_TYPE_PVN ||
+- memcmp(idNum, currHub->id.pvnID, sizeof idNum))) {
++ memcmp(idNum, currHub->id.pvnID, VNET_PVN_ID_LEN))) {
+ currHub = currHub->next;
+ }
+ return currHub;
+@@ -312,7 +312,7 @@ VNetHubAlloc(Bool allocPvn, // IN: TRUE
+
+ if (allocPvn) {
+ hub->hubType = HUB_TYPE_PVN;
+- memcpy(hub->id.pvnID, id, sizeof id);
++ memcpy(hub->id.pvnID, id, VNET_PVN_ID_LEN);
+ ++pvnInstance;
+ } else {
+ hub->hubType = HUB_TYPE_VNET;
