* [gentoo-commits] proj/vmware:master commit in: app-emulation/vmware-modules/files/
@ 2012-09-01 13:15 Vadim Kuznetsov
0 siblings, 0 replies; 13+ messages in thread
From: Vadim Kuznetsov @ 2012-09-01 13:15 UTC (permalink / raw
To: gentoo-commits
commit: 10b4b3b920e083941a3a2f571c895d9cb587e676
Author: Billy DeVincentis <billydv1 <AT> verizon <DOT> net>
AuthorDate: Sat Sep 1 13:12:38 2012 +0000
Commit: Vadim Kuznetsov <vadimk <AT> gentoo <DOT> org>
CommitDate: Sat Sep 1 13:12:38 2012 +0000
URL: http://git.overlays.gentoo.org/gitweb/?p=proj/vmware.git;a=commit;h=10b4b3b9
Bug 432918
Author: Billy DeVincentis <billydv1 <AT> verizon.net>
new file: 271-vmmon.patch
---
app-emulation/vmware-modules/files/271-vmmon.patch | 44 ++++++++++++++++++++
1 files changed, 44 insertions(+), 0 deletions(-)
diff --git a/app-emulation/vmware-modules/files/271-vmmon.patch b/app-emulation/vmware-modules/files/271-vmmon.patch
new file mode 100644
index 0000000..f197964
--- /dev/null
+++ b/app-emulation/vmware-modules/files/271-vmmon.patch
@@ -0,0 +1,44 @@
+diff -ru source900/vmmon-only/linux/hostif.c source/vmmon-only/linux/hostif.c
+--- source900/vmmon-only/linux/hostif.c 2012-07-23 18:18:55.000000000 +0900
++++ source/vmmon-only/linux/hostif.c 2012-08-03 16:20:23.200420885 +0900
+@@ -48,6 +48,7 @@
+ #include <linux/smp_lock.h>
+ #endif
+
++#include <asm/asm.h>
+ #include <asm/io.h>
+ #include <asm/uaccess.h>
+ #include <linux/mc146818rtc.h>
+@@ -3586,31 +3587,14 @@
+ {
+ int ret;
+ unsigned low, high;
+-#if defined(VM_X86_64)
+ asm volatile("2: rdmsr ; xor %0,%0\n"
+ "1:\n\t"
+ ".section .fixup,\"ax\"\n\t"
+ "3: mov %4,%0 ; jmp 1b\n\t"
+ ".previous\n\t"
+- ".section __ex_table,\"a\"\n\t"
+- ".balign 8\n"
+- ".quad 2b,3b\n"
+- ".previous\n"
++ _ASM_EXTABLE(2b,3b)
+ : "=r"(ret), "=a"(low), "=d"(high)
+ : "c"(msr), "i"(-EFAULT), "1"(0), "2"(0)); // init eax/edx to 0
+-#else
+- asm volatile("2: rdmsr ; xor %0,%0\n"
+- "1:\n\t"
+- ".section .fixup,\"ax\"\n\t"
+- "3: mov %4,%0 ; jmp 1b\n\t"
+- ".previous\n\t"
+- ".section __ex_table,\"a\"\n"
+- ".balign 4\n"
+- ".long 2b,3b\n"
+- ".previous\n"
+- : "=r"(ret), "=a"(low), "=d"(high)
+- : "c"(msr), "i"(-EFAULT), "1"(0), "2"(0)); // init eax/edx to 0
+-#endif // VM_X86_64
+ *val = (low | ((u64)(high) << 32));
+
+ return ret;
^ permalink raw reply related [flat|nested] 13+ messages in thread
* [gentoo-commits] proj/vmware:master commit in: app-emulation/vmware-modules/files/
@ 2014-10-10 13:55 Evan Teran
0 siblings, 0 replies; 13+ messages in thread
From: Evan Teran @ 2014-10-10 13:55 UTC (permalink / raw
To: gentoo-commits
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;
^ permalink raw reply related [flat|nested] 13+ messages in thread
* [gentoo-commits] proj/vmware:master commit in: app-emulation/vmware-modules/files/
@ 2014-10-10 13:55 Evan Teran
0 siblings, 0 replies; 13+ messages in thread
From: Evan Teran @ 2014-10-10 13:55 UTC (permalink / raw
To: gentoo-commits
commit: c03d98c3ed5ce0336044e36afcee4abf806d5fac
Author: Evan Teran <evan.teran <AT> gmail <DOT> com>
AuthorDate: Fri Oct 10 01:55:55 2014 +0000
Commit: Evan Teran <evan.teran <AT> gmail <DOT> com>
CommitDate: Fri Oct 10 01:55:55 2014 +0000
URL: http://sources.gentoo.org/gitweb/?p=proj/vmware.git;a=commit;h=c03d98c3
a better approach to dealing with deprecated macro redefinition
---
.../files/271-3.10-03-deprecated.patch | 75 ++++++++++------------
1 file changed, 35 insertions(+), 40 deletions(-)
diff --git a/app-emulation/vmware-modules/files/271-3.10-03-deprecated.patch b/app-emulation/vmware-modules/files/271-3.10-03-deprecated.patch
index 862ef97..3a9f785 100644
--- a/app-emulation/vmware-modules/files/271-3.10-03-deprecated.patch
+++ b/app-emulation/vmware-modules/files/271-3.10-03-deprecated.patch
@@ -1,90 +1,85 @@
diff -rupN vmblock-only/shared/vm_assert.h vmblock-only.new/shared/vm_assert.h
---- vmblock-only/shared/vm_assert.h 2013-11-05 23:33:27.000000000 -0500
-+++ vmblock-only.new/shared/vm_assert.h 2014-10-07 18:13:59.583815971 -0400
-@@ -237,12 +237,12 @@ EXTERN void WarningThrottled(uint32 *cou
+--- vmblock-only/shared/vm_assert.h 2014-10-09 21:50:54.221159088 -0400
++++ vmblock-only.new/shared/vm_assert.h 2014-10-09 21:53:04.612166156 -0400
+@@ -237,11 +237,13 @@ EXTERN void WarningThrottled(uint32 *cou
#define LOG_ONCE(_s) DO_ONCE(Log _s)
#ifdef VMX86_DEVEL
-- #define DEPRECATED(_fix) DO_ONCE( \
-+ #define VMWARE_DEPRECATED(_fix) DO_ONCE( \
++ #undef DEPRECATED
+ #define DEPRECATED(_fix) DO_ONCE( \
Warning("%s:%d: %s is DEPRECATED; %s\n", \
__FILE__, __LINE__, __FUNCTION__, \
_fix))
#else
-- #define DEPRECATED(_fix) do {} while (0)
-+ #define VMWARE_DEPRECATED(_fix) do {} while (0)
++ #undef DEPRECATED
+ #define DEPRECATED(_fix) do {} while (0)
#endif
-
diff -rupN vmci-only/shared/vm_assert.h vmci-only.new/shared/vm_assert.h
---- vmci-only/shared/vm_assert.h 2013-11-05 23:33:27.000000000 -0500
-+++ vmci-only.new/shared/vm_assert.h 2014-10-07 18:14:18.470816995 -0400
-@@ -237,12 +237,12 @@ EXTERN void WarningThrottled(uint32 *cou
+--- vmci-only/shared/vm_assert.h 2014-10-09 21:50:54.222159088 -0400
++++ vmci-only.new/shared/vm_assert.h 2014-10-09 21:52:52.348165492 -0400
+@@ -237,11 +237,13 @@ EXTERN void WarningThrottled(uint32 *cou
#define LOG_ONCE(_s) DO_ONCE(Log _s)
#ifdef VMX86_DEVEL
-- #define DEPRECATED(_fix) DO_ONCE( \
-+ #define VMWARE_DEPRECATED(_fix) DO_ONCE( \
++ #undef DEPRECATED
+ #define DEPRECATED(_fix) DO_ONCE( \
Warning("%s:%d: %s is DEPRECATED; %s\n", \
__FILE__, __LINE__, __FUNCTION__, \
_fix))
#else
-- #define DEPRECATED(_fix) do {} while (0)
-+ #define VMWARE_DEPRECATED(_fix) do {} while (0)
++ #undef DEPRECATED
+ #define DEPRECATED(_fix) do {} while (0)
#endif
-
diff -rupN vmmon-only/include/vm_assert.h vmmon-only.new/include/vm_assert.h
---- vmmon-only/include/vm_assert.h 2013-11-06 00:40:51.000000000 -0500
-+++ vmmon-only.new/include/vm_assert.h 2014-10-07 18:14:12.118816650 -0400
-@@ -237,12 +237,12 @@ EXTERN void WarningThrottled(uint32 *cou
+--- vmmon-only/include/vm_assert.h 2014-10-09 21:50:54.222159088 -0400
++++ vmmon-only.new/include/vm_assert.h 2014-10-09 21:52:36.877164653 -0400
+@@ -237,11 +237,13 @@ EXTERN void WarningThrottled(uint32 *cou
#define LOG_ONCE(_s) DO_ONCE(Log _s)
#ifdef VMX86_DEVEL
-- #define DEPRECATED(_fix) DO_ONCE( \
-+ #define VMWARE_DEPRECATED(_fix) DO_ONCE( \
++ #undef DEPRECATED
+ #define DEPRECATED(_fix) DO_ONCE( \
Warning("%s:%d: %s is DEPRECATED; %s\n", \
__FILE__, __LINE__, __FUNCTION__, \
_fix))
#else
-- #define DEPRECATED(_fix) do {} while (0)
-+ #define VMWARE_DEPRECATED(_fix) do {} while (0)
++ #undef DEPRECATED
+ #define DEPRECATED(_fix) do {} while (0)
#endif
-
diff -rupN vmnet-only/vm_assert.h vmnet-only.new/vm_assert.h
---- vmnet-only/vm_assert.h 2013-11-06 00:40:52.000000000 -0500
-+++ vmnet-only.new/vm_assert.h 2014-10-07 18:14:05.167816273 -0400
-@@ -237,12 +237,12 @@ EXTERN void WarningThrottled(uint32 *cou
+--- vmnet-only/vm_assert.h 2014-10-09 21:50:54.222159088 -0400
++++ vmnet-only.new/vm_assert.h 2014-10-09 21:52:57.736165784 -0400
+@@ -237,11 +237,13 @@ EXTERN void WarningThrottled(uint32 *cou
#define LOG_ONCE(_s) DO_ONCE(Log _s)
#ifdef VMX86_DEVEL
-- #define DEPRECATED(_fix) DO_ONCE( \
-+ #define VMWARE_DEPRECATED(_fix) DO_ONCE( \
++ #undef DEPRECATED
+ #define DEPRECATED(_fix) DO_ONCE( \
Warning("%s:%d: %s is DEPRECATED; %s\n", \
__FILE__, __LINE__, __FUNCTION__, \
_fix))
#else
-- #define DEPRECATED(_fix) do {} while (0)
-+ #define VMWARE_DEPRECATED(_fix) do {} while (0)
++ #undef DEPRECATED
+ #define DEPRECATED(_fix) do {} while (0)
#endif
-
diff -rupN vsock-only/shared/vm_assert.h vsock-only.new/shared/vm_assert.h
---- vsock-only/shared/vm_assert.h 2013-11-05 23:33:27.000000000 -0500
-+++ vsock-only.new/shared/vm_assert.h 2014-10-07 18:14:24.454817319 -0400
-@@ -237,12 +237,12 @@ EXTERN void WarningThrottled(uint32 *cou
+--- vsock-only/shared/vm_assert.h 2014-10-09 21:50:54.222159088 -0400
++++ vsock-only.new/shared/vm_assert.h 2014-10-09 21:52:45.352165112 -0400
+@@ -237,11 +237,13 @@ EXTERN void WarningThrottled(uint32 *cou
#define LOG_ONCE(_s) DO_ONCE(Log _s)
#ifdef VMX86_DEVEL
-- #define DEPRECATED(_fix) DO_ONCE( \
-+ #define VMWARE_DEPRECATED(_fix) DO_ONCE( \
++ #undef DEPRECATED
+ #define DEPRECATED(_fix) DO_ONCE( \
Warning("%s:%d: %s is DEPRECATED; %s\n", \
__FILE__, __LINE__, __FUNCTION__, \
_fix))
#else
-- #define DEPRECATED(_fix) do {} while (0)
-+ #define VMWARE_DEPRECATED(_fix) do {} while (0)
++ #undef DEPRECATED
+ #define DEPRECATED(_fix) do {} while (0)
#endif
-
^ permalink raw reply related [flat|nested] 13+ messages in thread
* [gentoo-commits] proj/vmware:master commit in: app-emulation/vmware-modules/files/
@ 2014-10-14 1:59 Evan Teran
0 siblings, 0 replies; 13+ messages in thread
From: Evan Teran @ 2014-10-14 1:59 UTC (permalink / raw
To: gentoo-commits
commit: a5c729fbf9a617c83527554d7a13da097d49c1f8
Author: Evan Teran <evan.teran <AT> gmail <DOT> com>
AuthorDate: Tue Oct 14 01:58:18 2014 +0000
Commit: Evan Teran <evan.teran <AT> gmail <DOT> com>
CommitDate: Tue Oct 14 01:58:18 2014 +0000
URL: http://sources.gentoo.org/gitweb/?p=proj/vmware.git;a=commit;h=a5c729fb
added comments explaining reason/origin of patches for 271 patches
Package-Manager: portage-2.2.8-r2
---
app-emulation/vmware-modules/files/271-3.10-00-userns.patch | 4 ++++
.../vmware-modules/files/271-3.10-01-create_proc_entry.patch | 4 ++++
app-emulation/vmware-modules/files/271-3.10-02-getname.patch | 5 +++++
app-emulation/vmware-modules/files/271-3.10-03-deprecated.patch | 4 ++++
app-emulation/vmware-modules/files/271-3.10-04-unused-typedef.patch | 3 +++
app-emulation/vmware-modules/files/271-3.10-05-dentry.patch | 4 ++++
app-emulation/vmware-modules/files/271-3.10-06-inode.patch | 4 ++++
app-emulation/vmware-modules/files/271-3.10-07-hub.patch | 5 +++++
app-emulation/vmware-modules/files/271-3.11-00-readdir.patch | 3 +++
app-emulation/vmware-modules/files/271-3.11-01-filldir.patch | 3 +++
app-emulation/vmware-modules/files/271-3.13-00-vmnet.patch | 3 +++
app-emulation/vmware-modules/files/271-3.15-00-readlink.patch | 2 ++
app-emulation/vmware-modules/files/271-3.15-01-vsock.patch | 3 +++
app-emulation/vmware-modules/files/271-3.17-00-netdev.patch | 4 ++++
14 files changed, 51 insertions(+)
diff --git a/app-emulation/vmware-modules/files/271-3.10-00-userns.patch b/app-emulation/vmware-modules/files/271-3.10-00-userns.patch
index c960b78..b1b78b7 100644
--- a/app-emulation/vmware-modules/files/271-3.10-00-userns.patch
+++ b/app-emulation/vmware-modules/files/271-3.10-00-userns.patch
@@ -1,3 +1,7 @@
+correctly initializes UID/GID values
+gets UID correctly in light of user namespace API
+origionally from https://462666.bugs.gentoo.org/attachment.cgi?id=342888
+
--- a/vmblock-only/linux/inode.c 2013-03-20 17:37:48.000000000 +0100
+++ b/vmblock-only/linux/inode.c 2013-03-20 17:41:22.000000000 +0100
@@ -135,7 +135,8 @@
diff --git a/app-emulation/vmware-modules/files/271-3.10-01-create_proc_entry.patch b/app-emulation/vmware-modules/files/271-3.10-01-create_proc_entry.patch
index 85c3def..889ae71 100644
--- a/app-emulation/vmware-modules/files/271-3.10-01-create_proc_entry.patch
+++ b/app-emulation/vmware-modules/files/271-3.10-01-create_proc_entry.patch
@@ -1,3 +1,7 @@
+uses the new proc_create function to create /proc entries
+instead of create_proc_entry which was deprecated:
+https://lkml.org/lkml/2013/4/11/215
+
--- a/vmblock-only/linux/control.c 2013-05-21 19:21:19.165750556 +0200
+++ b/vmblock-only/linux/control.c 2013-05-21 19:22:18.363747723 +0200
@@ -208,9 +208,10 @@
diff --git a/app-emulation/vmware-modules/files/271-3.10-02-getname.patch b/app-emulation/vmware-modules/files/271-3.10-02-getname.patch
index 7bcf536..05ed8db 100644
--- a/app-emulation/vmware-modules/files/271-3.10-02-getname.patch
+++ b/app-emulation/vmware-modules/files/271-3.10-02-getname.patch
@@ -1,3 +1,8 @@
+uses __getname/__putname instead of getname. getname was deprecated
+the new code calls __getname (which really is a specific type of
+memory allocator, then copies the string safely from user space
+into the allocated buffer
+
--- vmblock-only/linux/control.c 2014-03-15 15:28:40.871076076 +0100
+++ vmblock-only/linux/control.c.new 2014-03-15 15:29:15.079074439 +0100
@@ -279,11 +279,17 @@
diff --git a/app-emulation/vmware-modules/files/271-3.10-03-deprecated.patch b/app-emulation/vmware-modules/files/271-3.10-03-deprecated.patch
index 3a9f785..981aabd 100644
--- a/app-emulation/vmware-modules/files/271-3.10-03-deprecated.patch
+++ b/app-emulation/vmware-modules/files/271-3.10-03-deprecated.patch
@@ -1,3 +1,7 @@
+undefines DEPRECATED which is unfortunately also defined (as a string)
+in <linux/printk.h>. Realistically, this macro isn't even used, so this
+doesn't matter much. But it hushes some very loud warnings.
+
diff -rupN vmblock-only/shared/vm_assert.h vmblock-only.new/shared/vm_assert.h
--- vmblock-only/shared/vm_assert.h 2014-10-09 21:50:54.221159088 -0400
+++ vmblock-only.new/shared/vm_assert.h 2014-10-09 21:53:04.612166156 -0400
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
index d030110..d5129ec 100644
--- 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
@@ -1,3 +1,6 @@
+hushes warnings about unused typedefs which are part of the "static assert"
+technique that the code uses. We simply add an "__attribute__((unused)) to each of them
+
--- 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
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
index 8acecf5..f4f59d9 100644
--- a/app-emulation/vmware-modules/files/271-3.10-05-dentry.patch
+++ b/app-emulation/vmware-modules/files/271-3.10-05-dentry.patch
@@ -1,3 +1,7 @@
+starting with kernel 3.6, d_revalidate takes an unsigned int "flags"
+as the second argument, not a nameidata pointer! see fs/namei.c
+for implementation
+
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
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
index 0d30dbe..4f6246d 100644
--- a/app-emulation/vmware-modules/files/271-3.10-06-inode.patch
+++ b/app-emulation/vmware-modules/files/271-3.10-06-inode.patch
@@ -1,3 +1,7 @@
+starting with kernel 3.6, d_revalidate takes an unsigned int "flags"
+as the second argument, not a nameidata pointer! see fs/namei.c
+for implementation
+
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
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
index 50ab341..eebe4a2 100644
--- a/app-emulation/vmware-modules/files/271-3.10-07-hub.patch
+++ b/app-emulation/vmware-modules/files/271-3.10-07-hub.patch
@@ -1,3 +1,8 @@
+fixes a bug where sizeof was being used on a pointer when they clearly
+meant to use the size of the array referred to. Fortunately, the amount is
+always smaller than the actual size of the buffer, so likely not a security issue
+(and was fixed in vmware-workstaiton 10
+
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
diff --git a/app-emulation/vmware-modules/files/271-3.11-00-readdir.patch b/app-emulation/vmware-modules/files/271-3.11-00-readdir.patch
index 15a9a8f..b2f76d3 100644
--- a/app-emulation/vmware-modules/files/271-3.11-00-readdir.patch
+++ b/app-emulation/vmware-modules/files/271-3.11-00-readdir.patch
@@ -1,3 +1,6 @@
+replaces usage of vfs_readdir with iterate_dir. origionally found here:
+https://bugs.gentoo.org/show_bug.cgi?id=508204
+
diff -Naur vmblock-only/linux/file.c vmblock-only/linux/file.c
--- vmblock-only/linux/file.c 2013-11-05 23:33:26.000000000 -0500
+++ vmblock-only/linux/file.c 2014-04-26 10:58:03.062635343 -0400
diff --git a/app-emulation/vmware-modules/files/271-3.11-01-filldir.patch b/app-emulation/vmware-modules/files/271-3.11-01-filldir.patch
index d36c61a..2eec99b 100644
--- a/app-emulation/vmware-modules/files/271-3.11-01-filldir.patch
+++ b/app-emulation/vmware-modules/files/271-3.11-01-filldir.patch
@@ -1,3 +1,6 @@
+simply remove the code for Filldir since it is no longer used with the new
+iterate_dir API
+
diff -rupN vmblock-only/linux/file.c vmblock-only.new/linux/file.c
--- vmblock-only/linux/file.c 2014-10-07 23:22:46.832469618 -0400
+++ vmblock-only.new/linux/file.c 2014-10-07 23:24:35.276472720 -0400
diff --git a/app-emulation/vmware-modules/files/271-3.13-00-vmnet.patch b/app-emulation/vmware-modules/files/271-3.13-00-vmnet.patch
index 4e9d7e9..f65284f 100644
--- a/app-emulation/vmware-modules/files/271-3.13-00-vmnet.patch
+++ b/app-emulation/vmware-modules/files/271-3.13-00-vmnet.patch
@@ -1,3 +1,6 @@
+The new API to get the hooknum
+origionally from http://forums.gentoo.org/viewtopic-t-979802-start-25.html
+
--- work/vmnet-only/filter.c 2013-08-27 20:29:04.000000000 +0100
+++ patched/vmnet-only/filter.c 2014-01-26 01:09:05.184893854 +0000
@@ -27,6 +27,7 @@
diff --git a/app-emulation/vmware-modules/files/271-3.15-00-readlink.patch b/app-emulation/vmware-modules/files/271-3.15-00-readlink.patch
index 36be37f..b1c7f24 100644
--- a/app-emulation/vmware-modules/files/271-3.15-00-readlink.patch
+++ b/app-emulation/vmware-modules/files/271-3.15-00-readlink.patch
@@ -1,3 +1,5 @@
+replacing usage of vfs_readlink with new readlink_copy API
+
diff -rupN vmblock-only/linux/inode.c vmblock-only/linux/inode.c
--- vmblock-only/linux/inode.c 2014-10-05 23:20:14.545218357 -0400
+++ vmblock-only/linux/inode.c 2014-10-05 23:33:01.549259933 -0400
diff --git a/app-emulation/vmware-modules/files/271-3.15-01-vsock.patch b/app-emulation/vmware-modules/files/271-3.15-01-vsock.patch
index a880a75..9e8d9d1 100644
--- a/app-emulation/vmware-modules/files/271-3.15-01-vsock.patch
+++ b/app-emulation/vmware-modules/files/271-3.15-01-vsock.patch
@@ -1,3 +1,6 @@
+removing the no longer existing second parameter to sk_data_ready
+doesn't seem it ever served a purpose.
+
diff -rupN vsock-only/linux/notify.c vsock-only.new/linux/notify.c
--- vsock-only/linux/notify.c 2013-11-05 23:33:27.000000000 -0500
+++ vsock-only.new/linux/notify.c 2014-10-05 23:46:47.943304728 -0400
diff --git a/app-emulation/vmware-modules/files/271-3.17-00-netdev.patch b/app-emulation/vmware-modules/files/271-3.17-00-netdev.patch
index fbe1741..7c52455 100644
--- a/app-emulation/vmware-modules/files/271-3.17-00-netdev.patch
+++ b/app-emulation/vmware-modules/files/271-3.17-00-netdev.patch
@@ -1,3 +1,7 @@
+new alloc_netdev requires a new parameter. All examples in the kernel i've seen just
+use the constant NET_NAME_UNKNOWN.
+origionally from: https://communities.vmware.com/message/2425189
+
diff -rupN vmnet-only/netif.c vmnet-only.new/netif.c
--- vmnet-only/netif.c 2013-11-06 00:40:52.000000000 -0500
+++ vmnet-only.new/netif.c 2014-10-09 17:29:12.361307961 -0400
^ permalink raw reply related [flat|nested] 13+ messages in thread
* [gentoo-commits] proj/vmware:master commit in: app-emulation/vmware-modules/files/
@ 2014-10-14 2:08 Evan Teran
0 siblings, 0 replies; 13+ messages in thread
From: Evan Teran @ 2014-10-14 2:08 UTC (permalink / raw
To: gentoo-commits
commit: 2513650a3e9235695b3e37dc924fd26c1d65442f
Author: Evan Teran <evan.teran <AT> gmail <DOT> com>
AuthorDate: Tue Oct 14 02:03:46 2014 +0000
Commit: Evan Teran <evan.teran <AT> gmail <DOT> com>
CommitDate: Tue Oct 14 02:03:46 2014 +0000
URL: http://sources.gentoo.org/gitweb/?p=proj/vmware.git;a=commit;h=2513650a
added comments for 279 and fixed up some comments for 271 patches
Package-Manager: portage-2.2.8-r2
---
app-emulation/vmware-modules/files/271-3.10-06-inode.patch | 3 ++-
app-emulation/vmware-modules/files/271-3.13-00-vmnet.patch | 2 +-
app-emulation/vmware-modules/files/271-3.15-00-readlink.patch | 1 +
app-emulation/vmware-modules/files/279-3.10-00-userns.patch | 4 ++++
app-emulation/vmware-modules/files/279-3.10-01-getname.patch | 5 +++++
app-emulation/vmware-modules/files/279-3.10-03-deprecated.patch | 4 ++++
app-emulation/vmware-modules/files/279-3.10-04-dentry.patch | 4 ++++
app-emulation/vmware-modules/files/279-3.10-05-inode.patch | 5 +++++
app-emulation/vmware-modules/files/279-3.15-00-readlink.patch | 3 +++
app-emulation/vmware-modules/files/279-3.15-01-vsock.patch | 3 +++
app-emulation/vmware-modules/files/279-3.17-00-netdev.patch | 4 ++++
11 files changed, 36 insertions(+), 2 deletions(-)
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
index 4f6246d..01c8893 100644
--- a/app-emulation/vmware-modules/files/271-3.10-06-inode.patch
+++ b/app-emulation/vmware-modules/files/271-3.10-06-inode.patch
@@ -1,6 +1,7 @@
starting with kernel 3.6, d_revalidate takes an unsigned int "flags"
as the second argument, not a nameidata pointer! see fs/namei.c
-for implementation
+for implementation. Also changing vfs_follow_link to nd_set_link.
+See: https://lkml.org/lkml/2013/9/9/236
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
diff --git a/app-emulation/vmware-modules/files/271-3.13-00-vmnet.patch b/app-emulation/vmware-modules/files/271-3.13-00-vmnet.patch
index f65284f..1bf2207 100644
--- a/app-emulation/vmware-modules/files/271-3.13-00-vmnet.patch
+++ b/app-emulation/vmware-modules/files/271-3.13-00-vmnet.patch
@@ -1,4 +1,4 @@
-The new API to get the hooknum
+the new API to get the hooknum
origionally from http://forums.gentoo.org/viewtopic-t-979802-start-25.html
--- work/vmnet-only/filter.c 2013-08-27 20:29:04.000000000 +0100
diff --git a/app-emulation/vmware-modules/files/271-3.15-00-readlink.patch b/app-emulation/vmware-modules/files/271-3.15-00-readlink.patch
index b1c7f24..b8ee078 100644
--- a/app-emulation/vmware-modules/files/271-3.15-00-readlink.patch
+++ b/app-emulation/vmware-modules/files/271-3.15-00-readlink.patch
@@ -1,4 +1,5 @@
replacing usage of vfs_readlink with new readlink_copy API
+see: http://permalink.gmane.org/gmane.linux.kernel.commits.head/445090
diff -rupN vmblock-only/linux/inode.c vmblock-only/linux/inode.c
--- vmblock-only/linux/inode.c 2014-10-05 23:20:14.545218357 -0400
diff --git a/app-emulation/vmware-modules/files/279-3.10-00-userns.patch b/app-emulation/vmware-modules/files/279-3.10-00-userns.patch
index c960b78..b1b78b7 100644
--- a/app-emulation/vmware-modules/files/279-3.10-00-userns.patch
+++ b/app-emulation/vmware-modules/files/279-3.10-00-userns.patch
@@ -1,3 +1,7 @@
+correctly initializes UID/GID values
+gets UID correctly in light of user namespace API
+origionally from https://462666.bugs.gentoo.org/attachment.cgi?id=342888
+
--- a/vmblock-only/linux/inode.c 2013-03-20 17:37:48.000000000 +0100
+++ b/vmblock-only/linux/inode.c 2013-03-20 17:41:22.000000000 +0100
@@ -135,7 +135,8 @@
diff --git a/app-emulation/vmware-modules/files/279-3.10-01-getname.patch b/app-emulation/vmware-modules/files/279-3.10-01-getname.patch
index 7bcf536..05ed8db 100644
--- a/app-emulation/vmware-modules/files/279-3.10-01-getname.patch
+++ b/app-emulation/vmware-modules/files/279-3.10-01-getname.patch
@@ -1,3 +1,8 @@
+uses __getname/__putname instead of getname. getname was deprecated
+the new code calls __getname (which really is a specific type of
+memory allocator, then copies the string safely from user space
+into the allocated buffer
+
--- vmblock-only/linux/control.c 2014-03-15 15:28:40.871076076 +0100
+++ vmblock-only/linux/control.c.new 2014-03-15 15:29:15.079074439 +0100
@@ -279,11 +279,17 @@
diff --git a/app-emulation/vmware-modules/files/279-3.10-03-deprecated.patch b/app-emulation/vmware-modules/files/279-3.10-03-deprecated.patch
index 0cd1a16..98b28aa 100644
--- a/app-emulation/vmware-modules/files/279-3.10-03-deprecated.patch
+++ b/app-emulation/vmware-modules/files/279-3.10-03-deprecated.patch
@@ -1,3 +1,7 @@
+undefines DEPRECATED which is unfortunately also defined (as a string)
+in <linux/printk.h>. Realistically, this macro isn't even used, so this
+doesn't matter much. But it hushes some very loud warnings.
+
diff -rupN vmblock-only/shared/vm_assert.h vmblock-only.new/shared/vm_assert.h
--- vmblock-only/shared/vm_assert.h 2014-04-14 17:41:41.000000000 -0400
+++ vmblock-only.new/shared/vm_assert.h 2014-10-11 17:37:23.010352172 -0400
diff --git a/app-emulation/vmware-modules/files/279-3.10-04-dentry.patch b/app-emulation/vmware-modules/files/279-3.10-04-dentry.patch
index 8acecf5..f4f59d9 100644
--- a/app-emulation/vmware-modules/files/279-3.10-04-dentry.patch
+++ b/app-emulation/vmware-modules/files/279-3.10-04-dentry.patch
@@ -1,3 +1,7 @@
+starting with kernel 3.6, d_revalidate takes an unsigned int "flags"
+as the second argument, not a nameidata pointer! see fs/namei.c
+for implementation
+
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
diff --git a/app-emulation/vmware-modules/files/279-3.10-05-inode.patch b/app-emulation/vmware-modules/files/279-3.10-05-inode.patch
index 0d30dbe..01c8893 100644
--- a/app-emulation/vmware-modules/files/279-3.10-05-inode.patch
+++ b/app-emulation/vmware-modules/files/279-3.10-05-inode.patch
@@ -1,3 +1,8 @@
+starting with kernel 3.6, d_revalidate takes an unsigned int "flags"
+as the second argument, not a nameidata pointer! see fs/namei.c
+for implementation. Also changing vfs_follow_link to nd_set_link.
+See: https://lkml.org/lkml/2013/9/9/236
+
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
diff --git a/app-emulation/vmware-modules/files/279-3.15-00-readlink.patch b/app-emulation/vmware-modules/files/279-3.15-00-readlink.patch
index 36be37f..b8ee078 100644
--- a/app-emulation/vmware-modules/files/279-3.15-00-readlink.patch
+++ b/app-emulation/vmware-modules/files/279-3.15-00-readlink.patch
@@ -1,3 +1,6 @@
+replacing usage of vfs_readlink with new readlink_copy API
+see: http://permalink.gmane.org/gmane.linux.kernel.commits.head/445090
+
diff -rupN vmblock-only/linux/inode.c vmblock-only/linux/inode.c
--- vmblock-only/linux/inode.c 2014-10-05 23:20:14.545218357 -0400
+++ vmblock-only/linux/inode.c 2014-10-05 23:33:01.549259933 -0400
diff --git a/app-emulation/vmware-modules/files/279-3.15-01-vsock.patch b/app-emulation/vmware-modules/files/279-3.15-01-vsock.patch
index a880a75..9e8d9d1 100644
--- a/app-emulation/vmware-modules/files/279-3.15-01-vsock.patch
+++ b/app-emulation/vmware-modules/files/279-3.15-01-vsock.patch
@@ -1,3 +1,6 @@
+removing the no longer existing second parameter to sk_data_ready
+doesn't seem it ever served a purpose.
+
diff -rupN vsock-only/linux/notify.c vsock-only.new/linux/notify.c
--- vsock-only/linux/notify.c 2013-11-05 23:33:27.000000000 -0500
+++ vsock-only.new/linux/notify.c 2014-10-05 23:46:47.943304728 -0400
diff --git a/app-emulation/vmware-modules/files/279-3.17-00-netdev.patch b/app-emulation/vmware-modules/files/279-3.17-00-netdev.patch
index fbe1741..7c52455 100644
--- a/app-emulation/vmware-modules/files/279-3.17-00-netdev.patch
+++ b/app-emulation/vmware-modules/files/279-3.17-00-netdev.patch
@@ -1,3 +1,7 @@
+new alloc_netdev requires a new parameter. All examples in the kernel i've seen just
+use the constant NET_NAME_UNKNOWN.
+origionally from: https://communities.vmware.com/message/2425189
+
diff -rupN vmnet-only/netif.c vmnet-only.new/netif.c
--- vmnet-only/netif.c 2013-11-06 00:40:52.000000000 -0500
+++ vmnet-only.new/netif.c 2014-10-09 17:29:12.361307961 -0400
^ permalink raw reply related [flat|nested] 13+ messages in thread
* [gentoo-commits] proj/vmware:master commit in: app-emulation/vmware-modules/files/
@ 2014-10-14 2:28 Evan Teran
0 siblings, 0 replies; 13+ messages in thread
From: Evan Teran @ 2014-10-14 2:28 UTC (permalink / raw
To: gentoo-commits
commit: a4ebbb5986cd81342824655c853c6330425269d2
Author: Evan Teran <evan.teran <AT> gmail <DOT> com>
AuthorDate: Tue Oct 14 02:26:54 2014 +0000
Commit: Evan Teran <evan.teran <AT> gmail <DOT> com>
CommitDate: Tue Oct 14 02:26:54 2014 +0000
URL: http://sources.gentoo.org/gitweb/?p=proj/vmware.git;a=commit;h=a4ebbb59
seems that NET_NAME_USER is more appropriate than NET_NAME_UNKNOWN
adjusting patches
Package-Manager: portage-2.2.8-r2
---
app-emulation/vmware-modules/files/271-3.17-00-netdev.patch | 2 +-
app-emulation/vmware-modules/files/279-3.17-00-netdev.patch | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/app-emulation/vmware-modules/files/271-3.17-00-netdev.patch b/app-emulation/vmware-modules/files/271-3.17-00-netdev.patch
index 7c52455..e3ee3aa 100644
--- a/app-emulation/vmware-modules/files/271-3.17-00-netdev.patch
+++ b/app-emulation/vmware-modules/files/271-3.17-00-netdev.patch
@@ -10,7 +10,7 @@ diff -rupN vmnet-only/netif.c vmnet-only.new/netif.c
NULL_TERMINATE_STRING(deviceName);
- dev = alloc_netdev(sizeof *netIf, deviceName, VNetNetIfSetup);
-+ dev = alloc_netdev(sizeof *netIf, deviceName, NET_NAME_UNKNOWN, VNetNetIfSetup);
++ dev = alloc_netdev(sizeof *netIf, deviceName, NET_NAME_USER, VNetNetIfSetup);
if (!dev) {
retval = -ENOMEM;
goto out;
diff --git a/app-emulation/vmware-modules/files/279-3.17-00-netdev.patch b/app-emulation/vmware-modules/files/279-3.17-00-netdev.patch
index 7c52455..e3ee3aa 100644
--- a/app-emulation/vmware-modules/files/279-3.17-00-netdev.patch
+++ b/app-emulation/vmware-modules/files/279-3.17-00-netdev.patch
@@ -10,7 +10,7 @@ diff -rupN vmnet-only/netif.c vmnet-only.new/netif.c
NULL_TERMINATE_STRING(deviceName);
- dev = alloc_netdev(sizeof *netIf, deviceName, VNetNetIfSetup);
-+ dev = alloc_netdev(sizeof *netIf, deviceName, NET_NAME_UNKNOWN, VNetNetIfSetup);
++ dev = alloc_netdev(sizeof *netIf, deviceName, NET_NAME_USER, VNetNetIfSetup);
if (!dev) {
retval = -ENOMEM;
goto out;
^ permalink raw reply related [flat|nested] 13+ messages in thread
* [gentoo-commits] proj/vmware:master commit in: app-emulation/vmware-modules/files/
@ 2015-05-05 17:10 Evan Teran
0 siblings, 0 replies; 13+ messages in thread
From: Evan Teran @ 2015-05-05 17:10 UTC (permalink / raw
To: gentoo-commits
commit: 633505a21b03a51abaee1d90875693741cdb119e
Author: Evan Teran <evan.teran <AT> gmail <DOT> com>
AuthorDate: Tue May 5 17:09:16 2015 +0000
Commit: Evan Teran <evan.teran <AT> gmail <DOT> com>
CommitDate: Tue May 5 17:09:16 2015 +0000
URL: https://gitweb.gentoo.org/proj/vmware.git/commit/?id=633505a2
looks like this patch was missing a portion, my bad
Package-Manager: portage-2.2.18
.../vmware-modules/files/271-3.19-01-vmblock-path.patch | 15 +++++++++++++++
1 file changed, 15 insertions(+)
diff --git a/app-emulation/vmware-modules/files/271-3.19-01-vmblock-path.patch b/app-emulation/vmware-modules/files/271-3.19-01-vmblock-path.patch
index 4bf17e1..178d147 100644
--- a/app-emulation/vmware-modules/files/271-3.19-01-vmblock-path.patch
+++ b/app-emulation/vmware-modules/files/271-3.19-01-vmblock-path.patch
@@ -1,3 +1,6 @@
+Sources:
+https://531682.bugs.gentoo.org/attachment.cgi?id=396484
+https://531682.bugs.gentoo.org/attachment.cgi?id=396482
diff -rupN vmblock-only.orig/linux/dentry.c vmblock-only/linux/dentry.c
--- vmblock-only.orig/linux/dentry.c 2015-02-14 18:05:46.000000000 -0500
+++ vmblock-only/linux/dentry.c 2015-02-14 18:09:59.000000000 -0500
@@ -50,3 +53,15 @@ diff -rupN vmblock-only.orig/shared/compat_namei.h vmblock-only/shared/compat_na
#else
#define compat_path_lookup(name, flags, nd) path_lookup(name, flags, nd)
#endif
+diff -u vmblock-only.orig/linux/file.c vmblock-only/linux/file.c
+--- vmblock-only.orig/linux/file.c 2015-02-11 12:18:29.000000000 -0500
++++ vmblock-only/linux/file.c 2015-02-11 12:41:41.000000000 -0500
+@@ -92,7 +92,7 @@
+ * and that would try to acquire the inode's semaphore; if the two inodes
+ * are the same we'll deadlock.
+ */
+- if (actualFile->f_dentry && inode == actualFile->f_dentry->d_inode) {
++ if (actualFile->f_path.dentry && inode == actualFile->f_path.dentry->d_inode) {
+ Warning("FileOpOpen: identical inode encountered, open cannot succeed.\n");
+ if (filp_close(actualFile, current->files) < 0) {
+ Warning("FileOpOpen: unable to close opened file.\n");
^ permalink raw reply related [flat|nested] 13+ messages in thread
* [gentoo-commits] proj/vmware:master commit in: app-emulation/vmware-modules/files/
@ 2015-07-14 2:01 Evan Teran
0 siblings, 0 replies; 13+ messages in thread
From: Evan Teran @ 2015-07-14 2:01 UTC (permalink / raw
To: gentoo-commits
commit: 1250c78913e6593944098a62bf8f2812068edf68
Author: Evan Teran <evan.teran <AT> gmail <DOT> com>
AuthorDate: Tue Jul 14 02:01:17 2015 +0000
Commit: Evan Teran <evan.teran <AT> gmail <DOT> com>
CommitDate: Tue Jul 14 02:01:17 2015 +0000
URL: https://gitweb.gentoo.org/proj/vmware.git/commit/?id=1250c789
added some comments for patches
Package-Manager: portage-2.2.20
app-emulation/vmware-modules/files/304-3.10-00-dentry.patch | 1 +
app-emulation/vmware-modules/files/304-3.10-01-inode.patch | 3 +++
app-emulation/vmware-modules/files/304-3.10-02-control.patch | 2 ++
app-emulation/vmware-modules/files/304-3.10-03-inline.patch | 1 +
app-emulation/vmware-modules/files/304-3.18-00-version-redefined.patch | 1 +
app-emulation/vmware-modules/files/304-3.19-00-compat-namei.patch | 1 +
app-emulation/vmware-modules/files/304-3.19-01-dentry.patch | 1 +
app-emulation/vmware-modules/files/304-3.19-03-iovec.patch | 1 +
app-emulation/vmware-modules/files/304-3.19-04-iovec.patch | 1 +
app-emulation/vmware-modules/files/304-3.19-05-vmci_qpair.patch | 1 +
app-emulation/vmware-modules/files/304-3.19-06-vsock.patch | 1 +
app-emulation/vmware-modules/files/304-3.19-07-vsock.patch | 1 +
12 files changed, 15 insertions(+)
diff --git a/app-emulation/vmware-modules/files/304-3.10-00-dentry.patch b/app-emulation/vmware-modules/files/304-3.10-00-dentry.patch
index a0bb8b8..5cc445f 100644
--- a/app-emulation/vmware-modules/files/304-3.10-00-dentry.patch
+++ b/app-emulation/vmware-modules/files/304-3.10-00-dentry.patch
@@ -1,3 +1,4 @@
+Minor change the API, now it just gets passed flags instead of a pointer to the nameidata
--- a/vmblock-only/linux/dentry.c 2015-02-07 03:11:55.000000000 +0300
+++ c/vmblock-only/linux/dentry.c 2015-02-24 03:58:06.038605919 +0300
@@ -32,7 +32,11 @@
diff --git a/app-emulation/vmware-modules/files/304-3.10-01-inode.patch b/app-emulation/vmware-modules/files/304-3.10-01-inode.patch
index cf4ccd9..e12d84d 100644
--- a/app-emulation/vmware-modules/files/304-3.10-01-inode.patch
+++ b/app-emulation/vmware-modules/files/304-3.10-01-inode.patch
@@ -1,3 +1,6 @@
+Minor change the API, now it just gets passed flags instead of a pointer to the nameidata
+Properly initializes UID/GID with repsect to namespaces
+Some changes the readlink/setlink APIs
--- a/vmblock-only/linux/inode.c 2015-02-07 03:11:55.000000000 +0300
+++ c/vmblock-only/linux/inode.c 2015-02-24 03:58:06.039605762 +0300
@@ -35,9 +35,15 @@
diff --git a/app-emulation/vmware-modules/files/304-3.10-02-control.patch b/app-emulation/vmware-modules/files/304-3.10-02-control.patch
index bd3a265..9288353 100644
--- a/app-emulation/vmware-modules/files/304-3.10-02-control.patch
+++ b/app-emulation/vmware-modules/files/304-3.10-02-control.patch
@@ -1,3 +1,5 @@
+The API to create proc entries now takes the file ops structure directly, instead of being set after the fact
+Using new __getname/__putname API
--- a/vmblock-only/linux/control.c 2015-02-07 03:11:55.000000000 +0300
+++ c/vmblock-only/linux/control.c 2015-02-24 03:58:06.038605919 +0300
@@ -208,9 +208,11 @@
diff --git a/app-emulation/vmware-modules/files/304-3.10-03-inline.patch b/app-emulation/vmware-modules/files/304-3.10-03-inline.patch
index 73c2a5f..fa8f36a 100644
--- a/app-emulation/vmware-modules/files/304-3.10-03-inline.patch
+++ b/app-emulation/vmware-modules/files/304-3.10-03-inline.patch
@@ -1,3 +1,4 @@
+Hushes a warning
--- a/vmmon-only/linux/driver.c 2015-02-07 03:54:16.000000000 +0300
+++ c/vmmon-only/linux/driver.c 2015-02-24 03:58:06.042605293 +0300
@@ -1328,7 +1328,9 @@
diff --git a/app-emulation/vmware-modules/files/304-3.18-00-version-redefined.patch b/app-emulation/vmware-modules/files/304-3.18-00-version-redefined.patch
index 2d38824..22d6325 100644
--- a/app-emulation/vmware-modules/files/304-3.18-00-version-redefined.patch
+++ b/app-emulation/vmware-modules/files/304-3.18-00-version-redefined.patch
@@ -1,3 +1,4 @@
+Hushes some (but not all warnings) relating to redefinitions of this define
--- a/vmci-only/shared/vm_device_version.h 2015-02-07 03:11:55.000000000 +0300
+++ c/vmci-only/shared/vm_device_version.h 2015-02-24 03:58:06.041605450 +0300
@@ -53,7 +53,9 @@
diff --git a/app-emulation/vmware-modules/files/304-3.19-00-compat-namei.patch b/app-emulation/vmware-modules/files/304-3.19-00-compat-namei.patch
index ec73500..0182077 100644
--- a/app-emulation/vmware-modules/files/304-3.19-00-compat-namei.patch
+++ b/app-emulation/vmware-modules/files/304-3.19-00-compat-namei.patch
@@ -1,3 +1,4 @@
+A copy of this since it is no longer exported by the kernel headers
--- a/vmblock-only/shared/compat_namei.h 2015-02-07 03:11:55.000000000 +0300
+++ c/vmblock-only/shared/compat_namei.h 2015-02-24 03:51:25.235286047 +0300
@@ -21,6 +21,20 @@
diff --git a/app-emulation/vmware-modules/files/304-3.19-01-dentry.patch b/app-emulation/vmware-modules/files/304-3.19-01-dentry.patch
index 6f11a52..3e3be65 100644
--- a/app-emulation/vmware-modules/files/304-3.19-01-dentry.patch
+++ b/app-emulation/vmware-modules/files/304-3.19-01-dentry.patch
@@ -1,3 +1,4 @@
+There is an level of abstrxtion in the newre API as of 3.19 here
--- a/vmnet-only/driver.c 2015-02-07 03:54:17.000000000 +0300
+++ c/vmnet-only/driver.c 2015-02-24 03:58:06.043605137 +0300
@@ -1191,8 +1191,8 @@
diff --git a/app-emulation/vmware-modules/files/304-3.19-03-iovec.patch b/app-emulation/vmware-modules/files/304-3.19-03-iovec.patch
index b016fec..726d117 100644
--- a/app-emulation/vmware-modules/files/304-3.19-03-iovec.patch
+++ b/app-emulation/vmware-modules/files/304-3.19-03-iovec.patch
@@ -1,3 +1,4 @@
+using new iterator based API, this matches exactly the changes made upstream as of vmware-modules-304.2
--- a/vmnet-only/userif.c 2015-02-07 03:54:17.000000000 +0300
+++ c/vmnet-only/userif.c 2015-02-24 03:58:06.043605137 +0300
@@ -523,7 +523,15 @@
diff --git a/app-emulation/vmware-modules/files/304-3.19-04-iovec.patch b/app-emulation/vmware-modules/files/304-3.19-04-iovec.patch
index be54d9a..83f0cc8 100644
--- a/app-emulation/vmware-modules/files/304-3.19-04-iovec.patch
+++ b/app-emulation/vmware-modules/files/304-3.19-04-iovec.patch
@@ -1,3 +1,4 @@
+Some parts of the iovec API were replaced by the similar message API. Refactoring the code to use that.
--- a/vmci-only/linux/vmciKernelIf.c 2015-02-07 03:11:55.000000000 +0300
+++ c/vmci-only/linux/vmciKernelIf.c 2015-02-24 03:58:06.041605450 +0300
@@ -40,6 +40,7 @@
diff --git a/app-emulation/vmware-modules/files/304-3.19-05-vmci_qpair.patch b/app-emulation/vmware-modules/files/304-3.19-05-vmci_qpair.patch
index 1849a37..4dec3c4 100644
--- a/app-emulation/vmware-modules/files/304-3.19-05-vmci_qpair.patch
+++ b/app-emulation/vmware-modules/files/304-3.19-05-vmci_qpair.patch
@@ -1,3 +1,4 @@
+Some parts of the iovec API were replaced by the similar message API. Refactoring the code to use that.
diff -rupN vsock-only.old/linux/af_vsock.c vsock-only/linux/af_vsock.c
--- vsock-only.old/linux/af_vsock.c 2015-05-06 20:41:47.684046762 -0400
+++ vsock-only/linux/af_vsock.c 2015-05-06 20:52:15.245080779 -0400
diff --git a/app-emulation/vmware-modules/files/304-3.19-06-vsock.patch b/app-emulation/vmware-modules/files/304-3.19-06-vsock.patch
index 2e41230..9a2096e 100644
--- a/app-emulation/vmware-modules/files/304-3.19-06-vsock.patch
+++ b/app-emulation/vmware-modules/files/304-3.19-06-vsock.patch
@@ -1,3 +1,4 @@
+Some parts of the iovec API were replaced by the similar message API. Refactoring the code to use that.
diff -rupN vsock-only/linux/af_vsock.c vsock-only.new/linux/af_vsock.c
--- vsock-only/linux/af_vsock.c 2015-05-05 11:31:35.710099711 -0400
+++ vsock-only.new/linux/af_vsock.c 2015-05-05 11:36:33.260115840 -0400
diff --git a/app-emulation/vmware-modules/files/304-3.19-07-vsock.patch b/app-emulation/vmware-modules/files/304-3.19-07-vsock.patch
index 8c9d3cb..6aec2cd 100644
--- a/app-emulation/vmware-modules/files/304-3.19-07-vsock.patch
+++ b/app-emulation/vmware-modules/files/304-3.19-07-vsock.patch
@@ -1,3 +1,4 @@
+Some parts of the iovec API were replaced by the similar message API. Refactoring the code to use that.
diff -rupN vsock-only/linux/af_vsock.c vsock-only.new/linux/af_vsock.c
--- vsock-only/linux/af_vsock.c 2015-05-05 11:26:05.145081792 -0400
+++ vsock-only.new/linux/af_vsock.c 2015-05-05 11:30:54.304097466 -0400
^ permalink raw reply related [flat|nested] 13+ messages in thread
* [gentoo-commits] proj/vmware:master commit in: app-emulation/vmware-modules/files/
@ 2016-05-27 23:11 Fabio Rossi
0 siblings, 0 replies; 13+ messages in thread
From: Fabio Rossi @ 2016-05-27 23:11 UTC (permalink / raw
To: gentoo-commits
commit: af19a5d912cdd537f70667722d2fb3cbb14b3d35
Author: Fabio Rossi <rossi.f <AT> inwind <DOT> it>
AuthorDate: Fri May 27 21:31:39 2016 +0000
Commit: Fabio Rossi <rossi.f <AT> inwind <DOT> net>
CommitDate: Fri May 27 22:57:07 2016 +0000
URL: https://gitweb.gentoo.org/proj/vmware.git/commit/?id=af19a5d9
app-emulation/vmware-modules: fix patching of version 308 for kernel 4.5
The old patch 308-4.05-00-vmblock-follow_link.patch was not complete
(probably produced before final 4.5-rc1 release). The problem was
triggering a build failure on some systems.
The patch for version 304 was already correct.
.../files/308-4.05-00-vmblock-follow_link.patch | 33 ++++++++++++++--------
1 file changed, 22 insertions(+), 11 deletions(-)
diff --git a/app-emulation/vmware-modules/files/308-4.05-00-vmblock-follow_link.patch b/app-emulation/vmware-modules/files/308-4.05-00-vmblock-follow_link.patch
index c139292..03311b0 100644
--- a/app-emulation/vmware-modules/files/308-4.05-00-vmblock-follow_link.patch
+++ b/app-emulation/vmware-modules/files/308-4.05-00-vmblock-follow_link.patch
@@ -1,12 +1,12 @@
---- vmblock-only/linux/inode.c 2016-01-30 19:13:04.019947435 +0100
-+++ vmblock-only/linux/inode.c.new 2016-01-30 19:13:56.226950354 +0100
+--- vmblock-only/linux/inode.c.old 2016-05-27 15:12:49.315632906 +0200
++++ vmblock-only/linux/inode.c 2016-05-27 22:57:39.550192422 +0200
@@ -44,7 +44,9 @@
static int InodeOpReadlink(struct dentry *, char __user *, int);
#endif
-
+
-#if LINUX_VERSION_CODE >= KERNEL_VERSION(4, 1, 99)
+#if LINUX_VERSION_CODE >= KERNEL_VERSION(4, 4, 99)
-+static const char *InodeOpFollowlink(struct dentry *dentry, struct inode *inode, void **cookie);
++static const char *InodeOpFollowlink(struct dentry *dentry, struct inode *inode, struct delayed_call *done);
+#elif LINUX_VERSION_CODE >= KERNEL_VERSION(4, 1, 99)
static const char *InodeOpFollowlink(struct dentry *dentry, void **cookie);
#elif LINUX_VERSION_CODE >= KERNEL_VERSION(2, 6, 13)
@@ -21,21 +21,23 @@
.follow_link = InodeOpFollowlink,
+#endif
};
-
+
/*
-@@ -231,6 +237,9 @@
+@@ -231,7 +237,10 @@
static int
#endif
InodeOpFollowlink(struct dentry *dentry, // IN : dentry of symlink
+-#if LINUX_VERSION_CODE >= KERNEL_VERSION(4, 1, 99)
+#if LINUX_VERSION_CODE >= KERNEL_VERSION(4, 4, 99)
+ struct inode *inode,
-+#endif
- #if LINUX_VERSION_CODE >= KERNEL_VERSION(4, 1, 99)
++ struct delayed_call *done)
++#elif LINUX_VERSION_CODE >= KERNEL_VERSION(4, 1, 99)
void **cookie) // OUT: stores opaque pointer
#else
-@@ -241,12 +250,20 @@
+ struct nameidata *nd) // OUT: stores result
+@@ -241,18 +250,28 @@
VMBlockInodeInfo *iinfo;
-
+
if (!dentry) {
+#if LINUX_VERSION_CODE >= KERNEL_VERSION(4, 4, 99)
+ ret = -ECHILD;
@@ -45,7 +47,7 @@
+#endif
goto out;
}
-
+
+#if LINUX_VERSION_CODE >= KERNEL_VERSION(4, 4, 99)
+ iinfo = INODE_TO_IINFO(inode);
+#else
@@ -54,3 +56,12 @@
if (!iinfo) {
ret = -EINVAL;
goto out;
+ }
+
+-#if LINUX_VERSION_CODE >= KERNEL_VERSION(4, 1, 99)
++#if LINUX_VERSION_CODE >= KERNEL_VERSION(4, 4, 99)
++ return iinfo->name;
++#elif LINUX_VERSION_CODE >= KERNEL_VERSION(4, 1, 99)
+ return *cookie = iinfo->name;
+ #else
+ nd_set_link(nd, iinfo->name);
^ permalink raw reply related [flat|nested] 13+ messages in thread
* [gentoo-commits] proj/vmware:master commit in: app-emulation/vmware-modules/files/
@ 2016-08-05 7:29 Fabio Rossi
0 siblings, 0 replies; 13+ messages in thread
From: Fabio Rossi @ 2016-08-05 7:29 UTC (permalink / raw
To: gentoo-commits
commit: 84ce9f6be8f1b115b9a3c454f3d9d8b2ff6db253
Author: Fabio Rossi <rossi.f <AT> inwind <DOT> it>
AuthorDate: Fri Aug 5 07:24:03 2016 +0000
Commit: Fabio Rossi <rossi.f <AT> inwind <DOT> net>
CommitDate: Fri Aug 5 07:24:03 2016 +0000
URL: https://gitweb.gentoo.org/proj/vmware.git/commit/?id=84ce9f6b
app-emulation/vmware-modules: fix version 304.3 with hardened
.../vmware-modules/files/304-hardened.patch | 62 ++++++----------------
1 file changed, 17 insertions(+), 45 deletions(-)
diff --git a/app-emulation/vmware-modules/files/304-hardened.patch b/app-emulation/vmware-modules/files/304-hardened.patch
index cc3e041..822bd57 100644
--- a/app-emulation/vmware-modules/files/304-hardened.patch
+++ b/app-emulation/vmware-modules/files/304-hardened.patch
@@ -1,8 +1,6 @@
-diff --git a/vmmon-only/linux/driver.c b/vmmon-only/linux/driver.c
-index b21dd44..960c2aa 100644
---- a/vmmon-only/linux/driver.c
-+++ b/vmmon-only/linux/driver.c
-@@ -178,7 +178,22 @@ static struct vm_operations_struct vmuser_mops = {
+--- vmmon-only/linux/driver.c.orig 2016-07-28 22:10:27.464215083 +0200
++++ vmmon-only/linux/driver.c 2016-07-28 22:54:20.796362329 +0200
+@@ -124,7 +124,16 @@ static struct vm_operations_struct vmuse
#endif
};
@@ -10,25 +8,19 @@ index b21dd44..960c2aa 100644
+static struct file_operations vmuser_fops = {
+ .owner = THIS_MODULE,
+ .poll = LinuxDriverPoll,
-+#ifdef HAVE_UNLOCKED_IOCTL
-+ .unlocked_ioctl = LinuxDriver_UnlockedIoctl,
-+#else
-+ .ioctl = LinuxDriver_Ioctl,
-+#endif
-+#ifdef HAVE_COMPAT_IOCTL
-+ .compat_ioctl = LinuxDriver_UnlockedIoctl,
-+#endif
++ .unlocked_ioctl = LinuxDriver_Ioctl,
++ .compat_ioctl = LinuxDriver_Ioctl,
+ .open = LinuxDriver_Open,
+ .release = LinuxDriver_Close,
+ .mmap = LinuxDriverMmap
+};
+
static struct timer_list tscTimer;
-
- /*
-@@ -357,27 +372,6 @@ init_module(void)
- spin_lock_init(&linuxState.pollListLock);
- #endif
+ static Atomic_uint32 tsckHz;
+ static VmTimeStart tsckHzStartTime;
+@@ -317,21 +326,6 @@ init_module(void)
+ linuxState.fastClockPriority = -20;
+ linuxState.swapSize = VMMON_UNKNOWN_SWAP_SIZE;
- /*
- * Initialize the file_operations structure. Because this code is always
@@ -39,14 +31,8 @@ index b21dd44..960c2aa 100644
- memset(&vmuser_fops, 0, sizeof vmuser_fops);
- vmuser_fops.owner = THIS_MODULE;
- vmuser_fops.poll = LinuxDriverPoll;
--#ifdef HAVE_UNLOCKED_IOCTL
-- vmuser_fops.unlocked_ioctl = LinuxDriver_UnlockedIoctl;
--#else
-- vmuser_fops.ioctl = LinuxDriver_Ioctl;
--#endif
--#ifdef HAVE_COMPAT_IOCTL
-- vmuser_fops.compat_ioctl = LinuxDriver_UnlockedIoctl;
--#endif
+- vmuser_fops.unlocked_ioctl = LinuxDriver_Ioctl;
+- vmuser_fops.compat_ioctl = LinuxDriver_Ioctl;
- vmuser_fops.open = LinuxDriver_Open;
- vmuser_fops.release = LinuxDriver_Close;
- vmuser_fops.mmap = LinuxDriverMmap;
@@ -54,13 +40,11 @@ index b21dd44..960c2aa 100644
#ifdef VMX86_DEVEL
devel_init_module();
linuxState.minor = 0;
-diff --git a/vmnet-only/driver.c b/vmnet-only/driver.c
-index b12b982..40bd4cf 100644
---- a/vmnet-only/driver.c
-+++ b/vmnet-only/driver.c
-@@ -165,7 +165,22 @@ static long VNetFileOpUnlockedIoctl(struct file * filp,
+--- vmnet-only/driver.c.orig 2016-04-15 01:48:48.000000000 +0200
++++ vmnet-only/driver.c 2016-07-28 22:54:20.797362329 +0200
+@@ -137,7 +137,16 @@ static ssize_t VNetFileOpWrite(struct f
+ static long VNetFileOpUnlockedIoctl(struct file * filp,
unsigned int iocmd, unsigned long ioarg);
- #endif
-static struct file_operations vnetFileOps;
+static struct file_operations vnetFileOps = {
@@ -68,21 +52,15 @@ index b12b982..40bd4cf 100644
+ .read = VNetFileOpRead,
+ .write = VNetFileOpWrite,
+ .poll = VNetFileOpPoll,
-+#ifdef HAVE_UNLOCKED_IOCTL
+ .unlocked_ioctl = VNetFileOpUnlockedIoctl,
-+#else
-+ .ioctl = VNetFileOpIoctl,
-+#endif
-+#ifdef HAVE_COMPAT_IOCTL
+ .compat_ioctl = VNetFileOpUnlockedIoctl,
-+#endif
+ .open = VNetFileOpOpen,
+ .release = VNetFileOpClose
+};
/*
* Utility functions
-@@ -476,28 +491,6 @@ init_module(void)
+@@ -317,22 +326,6 @@ init_module(void)
goto err_proto;
}
@@ -97,14 +75,8 @@ index b12b982..40bd4cf 100644
- vnetFileOps.read = VNetFileOpRead;
- vnetFileOps.write = VNetFileOpWrite;
- vnetFileOps.poll = VNetFileOpPoll;
--#ifdef HAVE_UNLOCKED_IOCTL
- vnetFileOps.unlocked_ioctl = VNetFileOpUnlockedIoctl;
--#else
-- vnetFileOps.ioctl = VNetFileOpIoctl;
--#endif
--#ifdef HAVE_COMPAT_IOCTL
- vnetFileOps.compat_ioctl = VNetFileOpUnlockedIoctl;
--#endif
- vnetFileOps.open = VNetFileOpOpen;
- vnetFileOps.release = VNetFileOpClose;
-
^ permalink raw reply related [flat|nested] 13+ messages in thread
* [gentoo-commits] proj/vmware:master commit in: app-emulation/vmware-modules/files/
@ 2016-08-17 12:38 Fabio Rossi
0 siblings, 0 replies; 13+ messages in thread
From: Fabio Rossi @ 2016-08-17 12:38 UTC (permalink / raw
To: gentoo-commits
commit: 5f6e3b9c5c56a7f3d470a42d628736f1f90a5e4e
Author: Fabio Rossi <rossi.f <AT> inwind <DOT> it>
AuthorDate: Wed Aug 17 12:35:18 2016 +0000
Commit: Fabio Rossi <rossi.f <AT> inwind <DOT> net>
CommitDate: Wed Aug 17 12:35:18 2016 +0000
URL: https://gitweb.gentoo.org/proj/vmware.git/commit/?id=5f6e3b9c
app-emulation/vmware-modules: really fix hardened with 304.x
app-emulation/vmware-modules/files/304-hardened.patch | 8 +-------
1 file changed, 1 insertion(+), 7 deletions(-)
diff --git a/app-emulation/vmware-modules/files/304-hardened.patch b/app-emulation/vmware-modules/files/304-hardened.patch
index cc3e041..588abca 100644
--- a/app-emulation/vmware-modules/files/304-hardened.patch
+++ b/app-emulation/vmware-modules/files/304-hardened.patch
@@ -82,7 +82,7 @@ index b12b982..40bd4cf 100644
/*
* Utility functions
-@@ -476,28 +491,6 @@ init_module(void)
+@@ -476,22 +491,6 @@ init_module(void)
goto err_proto;
}
@@ -97,14 +97,8 @@ index b12b982..40bd4cf 100644
- vnetFileOps.read = VNetFileOpRead;
- vnetFileOps.write = VNetFileOpWrite;
- vnetFileOps.poll = VNetFileOpPoll;
--#ifdef HAVE_UNLOCKED_IOCTL
- vnetFileOps.unlocked_ioctl = VNetFileOpUnlockedIoctl;
--#else
-- vnetFileOps.ioctl = VNetFileOpIoctl;
--#endif
--#ifdef HAVE_COMPAT_IOCTL
- vnetFileOps.compat_ioctl = VNetFileOpUnlockedIoctl;
--#endif
- vnetFileOps.open = VNetFileOpOpen;
- vnetFileOps.release = VNetFileOpClose;
-
^ permalink raw reply related [flat|nested] 13+ messages in thread
* [gentoo-commits] proj/vmware:master commit in: app-emulation/vmware-modules/files/
@ 2016-08-17 12:38 Fabio Rossi
0 siblings, 0 replies; 13+ messages in thread
From: Fabio Rossi @ 2016-08-17 12:38 UTC (permalink / raw
To: gentoo-commits
commit: 88f3b5bda1e08e8c9e35a5ad96b25c0cb7cda545
Author: Fabio Rossi <rossi.f <AT> inwind <DOT> it>
AuthorDate: Wed Aug 17 12:10:38 2016 +0000
Commit: Fabio Rossi <rossi.f <AT> inwind <DOT> net>
CommitDate: Wed Aug 17 12:10:38 2016 +0000
URL: https://gitweb.gentoo.org/proj/vmware.git/commit/?id=88f3b5bd
Revert "app-emulation/vmware-modules: fix version 304.3 with hardened"
This reverts commit 84ce9f6be8f1b115b9a3c454f3d9d8b2ff6db253.
.../vmware-modules/files/304-hardened.patch | 62 ++++++++++++++++------
1 file changed, 45 insertions(+), 17 deletions(-)
diff --git a/app-emulation/vmware-modules/files/304-hardened.patch b/app-emulation/vmware-modules/files/304-hardened.patch
index 822bd57..cc3e041 100644
--- a/app-emulation/vmware-modules/files/304-hardened.patch
+++ b/app-emulation/vmware-modules/files/304-hardened.patch
@@ -1,6 +1,8 @@
---- vmmon-only/linux/driver.c.orig 2016-07-28 22:10:27.464215083 +0200
-+++ vmmon-only/linux/driver.c 2016-07-28 22:54:20.796362329 +0200
-@@ -124,7 +124,16 @@ static struct vm_operations_struct vmuse
+diff --git a/vmmon-only/linux/driver.c b/vmmon-only/linux/driver.c
+index b21dd44..960c2aa 100644
+--- a/vmmon-only/linux/driver.c
++++ b/vmmon-only/linux/driver.c
+@@ -178,7 +178,22 @@ static struct vm_operations_struct vmuser_mops = {
#endif
};
@@ -8,19 +10,25 @@
+static struct file_operations vmuser_fops = {
+ .owner = THIS_MODULE,
+ .poll = LinuxDriverPoll,
-+ .unlocked_ioctl = LinuxDriver_Ioctl,
-+ .compat_ioctl = LinuxDriver_Ioctl,
++#ifdef HAVE_UNLOCKED_IOCTL
++ .unlocked_ioctl = LinuxDriver_UnlockedIoctl,
++#else
++ .ioctl = LinuxDriver_Ioctl,
++#endif
++#ifdef HAVE_COMPAT_IOCTL
++ .compat_ioctl = LinuxDriver_UnlockedIoctl,
++#endif
+ .open = LinuxDriver_Open,
+ .release = LinuxDriver_Close,
+ .mmap = LinuxDriverMmap
+};
+
static struct timer_list tscTimer;
- static Atomic_uint32 tsckHz;
- static VmTimeStart tsckHzStartTime;
-@@ -317,21 +326,6 @@ init_module(void)
- linuxState.fastClockPriority = -20;
- linuxState.swapSize = VMMON_UNKNOWN_SWAP_SIZE;
+
+ /*
+@@ -357,27 +372,6 @@ init_module(void)
+ spin_lock_init(&linuxState.pollListLock);
+ #endif
- /*
- * Initialize the file_operations structure. Because this code is always
@@ -31,8 +39,14 @@
- memset(&vmuser_fops, 0, sizeof vmuser_fops);
- vmuser_fops.owner = THIS_MODULE;
- vmuser_fops.poll = LinuxDriverPoll;
-- vmuser_fops.unlocked_ioctl = LinuxDriver_Ioctl;
-- vmuser_fops.compat_ioctl = LinuxDriver_Ioctl;
+-#ifdef HAVE_UNLOCKED_IOCTL
+- vmuser_fops.unlocked_ioctl = LinuxDriver_UnlockedIoctl;
+-#else
+- vmuser_fops.ioctl = LinuxDriver_Ioctl;
+-#endif
+-#ifdef HAVE_COMPAT_IOCTL
+- vmuser_fops.compat_ioctl = LinuxDriver_UnlockedIoctl;
+-#endif
- vmuser_fops.open = LinuxDriver_Open;
- vmuser_fops.release = LinuxDriver_Close;
- vmuser_fops.mmap = LinuxDriverMmap;
@@ -40,11 +54,13 @@
#ifdef VMX86_DEVEL
devel_init_module();
linuxState.minor = 0;
---- vmnet-only/driver.c.orig 2016-04-15 01:48:48.000000000 +0200
-+++ vmnet-only/driver.c 2016-07-28 22:54:20.797362329 +0200
-@@ -137,7 +137,16 @@ static ssize_t VNetFileOpWrite(struct f
- static long VNetFileOpUnlockedIoctl(struct file * filp,
+diff --git a/vmnet-only/driver.c b/vmnet-only/driver.c
+index b12b982..40bd4cf 100644
+--- a/vmnet-only/driver.c
++++ b/vmnet-only/driver.c
+@@ -165,7 +165,22 @@ static long VNetFileOpUnlockedIoctl(struct file * filp,
unsigned int iocmd, unsigned long ioarg);
+ #endif
-static struct file_operations vnetFileOps;
+static struct file_operations vnetFileOps = {
@@ -52,15 +68,21 @@
+ .read = VNetFileOpRead,
+ .write = VNetFileOpWrite,
+ .poll = VNetFileOpPoll,
++#ifdef HAVE_UNLOCKED_IOCTL
+ .unlocked_ioctl = VNetFileOpUnlockedIoctl,
++#else
++ .ioctl = VNetFileOpIoctl,
++#endif
++#ifdef HAVE_COMPAT_IOCTL
+ .compat_ioctl = VNetFileOpUnlockedIoctl,
++#endif
+ .open = VNetFileOpOpen,
+ .release = VNetFileOpClose
+};
/*
* Utility functions
-@@ -317,22 +326,6 @@ init_module(void)
+@@ -476,28 +491,6 @@ init_module(void)
goto err_proto;
}
@@ -75,8 +97,14 @@
- vnetFileOps.read = VNetFileOpRead;
- vnetFileOps.write = VNetFileOpWrite;
- vnetFileOps.poll = VNetFileOpPoll;
+-#ifdef HAVE_UNLOCKED_IOCTL
- vnetFileOps.unlocked_ioctl = VNetFileOpUnlockedIoctl;
+-#else
+- vnetFileOps.ioctl = VNetFileOpIoctl;
+-#endif
+-#ifdef HAVE_COMPAT_IOCTL
- vnetFileOps.compat_ioctl = VNetFileOpUnlockedIoctl;
+-#endif
- vnetFileOps.open = VNetFileOpOpen;
- vnetFileOps.release = VNetFileOpClose;
-
^ permalink raw reply related [flat|nested] 13+ messages in thread
* [gentoo-commits] proj/vmware:master commit in: app-emulation/vmware-modules/files/
@ 2017-06-25 21:43 Fabio Rossi
0 siblings, 0 replies; 13+ messages in thread
From: Fabio Rossi @ 2017-06-25 21:43 UTC (permalink / raw
To: gentoo-commits
commit: d3812eca3c9455951be5632544f70f3fff9205c3
Author: Fabio Rossi <rossi.f <AT> inwind <DOT> it>
AuthorDate: Sun Jun 25 21:42:48 2017 +0000
Commit: Fabio Rossi <rossi.f <AT> inwind <DOT> net>
CommitDate: Sun Jun 25 21:42:48 2017 +0000
URL: https://gitweb.gentoo.org/proj/vmware.git/commit/?id=d3812eca
app-emulation/vmware-modules: removed unused patches in FILESDIR
.../files/308-4.03-00-vmmon-misc_deregister.patch | 14 ----------
.../files/308-4.07-00-trans_start.patch | 11 --------
.../vmware-modules/files/308-4.11-02-vmmon.patch | 30 ----------------------
3 files changed, 55 deletions(-)
diff --git a/app-emulation/vmware-modules/files/308-4.03-00-vmmon-misc_deregister.patch b/app-emulation/vmware-modules/files/308-4.03-00-vmmon-misc_deregister.patch
deleted file mode 100644
index 9f0df66..0000000
--- a/app-emulation/vmware-modules/files/308-4.03-00-vmmon-misc_deregister.patch
+++ /dev/null
@@ -1,14 +0,0 @@
-diff -ru work.old/vmmon-only/linux/driver.c work/vmmon-only/linux/driver.c
---- work.old/vmmon-only/linux/driver.c 2015-08-14 22:39:49.000000000 +0200
-+++ work/vmmon-only/linux/driver.c 2015-09-14 22:11:06.807909249 +0200
-@@ -387,9 +387,7 @@
- #ifdef VMX86_DEVEL
- unregister_chrdev(linuxState.major, linuxState.deviceName);
- #else
-- if (misc_deregister(&linuxState.misc)) {
-- Warning("Module %s: error unregistering\n", linuxState.deviceName);
-- }
-+ misc_deregister(&linuxState.misc);
- #endif
-
- Log("Module %s: unloaded\n", linuxState.deviceName);
diff --git a/app-emulation/vmware-modules/files/308-4.07-00-trans_start.patch b/app-emulation/vmware-modules/files/308-4.07-00-trans_start.patch
deleted file mode 100644
index 751924f..0000000
--- a/app-emulation/vmware-modules/files/308-4.07-00-trans_start.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- ./vmnet-only/netif.c.old 2016-05-19 20:13:14.259914206 +0200
-+++ ./vmnet-only/netif.c 2016-05-19 20:13:21.250914596 +0200
-@@ -465,7 +465,7 @@
- VNetSend(&netIf->port.jack, skb);
-
- netIf->stats.tx_packets++;
-- dev->trans_start = jiffies;
-+ netif_trans_update(dev);
-
- return 0;
- }
diff --git a/app-emulation/vmware-modules/files/308-4.11-02-vmmon.patch b/app-emulation/vmware-modules/files/308-4.11-02-vmmon.patch
deleted file mode 100644
index b126453..0000000
--- a/app-emulation/vmware-modules/files/308-4.11-02-vmmon.patch
+++ /dev/null
@@ -1,30 +0,0 @@
-diff -ur old/vmmon-only/linux/driver.c vmmon-only/linux/driver.c
---- old/vmmon-only/linux/driver.c 2016-11-12 09:15:52.000000000 +0200
-+++ vmmon-only/linux/driver.c 2017-03-06 10:46:33.347053458 +0200
-@@ -105,7 +105,7 @@
- static int LinuxDriver_Close(struct inode *inode, struct file *filp);
- static unsigned int LinuxDriverPoll(struct file *file, poll_table *wait);
- #if defined(VMW_NOPAGE_2624)
--static int LinuxDriverFault(struct vm_area_struct *vma, struct vm_fault *fault);
-+static int LinuxDriverFault(struct vm_fault *fault);
- #else
- static struct page *LinuxDriverNoPage(struct vm_area_struct *vma,
- unsigned long address,
-@@ -882,15 +882,14 @@
- */
-
- #if defined(VMW_NOPAGE_2624)
--static int LinuxDriverFault(struct vm_area_struct *vma, //IN
-- struct vm_fault *fault) //IN/OUT
-+static int LinuxDriverFault(struct vm_fault *fault) //IN/OUT
- #else
- static struct page *LinuxDriverNoPage(struct vm_area_struct *vma, //IN
- unsigned long address, //IN
- int *type) //OUT: Fault type
- #endif
- {
-- VMLinux *vmLinux = (VMLinux *) vma->vm_file->private_data;
-+ VMLinux *vmLinux = (VMLinux *) fault->vma->vm_file->private_data;
- unsigned long pg;
- struct page* page;
-
^ permalink raw reply related [flat|nested] 13+ messages in thread
end of thread, other threads:[~2017-06-25 21:43 UTC | newest]
Thread overview: 13+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2012-09-01 13:15 [gentoo-commits] proj/vmware:master commit in: app-emulation/vmware-modules/files/ Vadim Kuznetsov
-- strict thread matches above, loose matches on Subject: below --
2014-10-10 13:55 Evan Teran
2014-10-10 13:55 Evan Teran
2014-10-14 1:59 Evan Teran
2014-10-14 2:08 Evan Teran
2014-10-14 2:28 Evan Teran
2015-05-05 17:10 Evan Teran
2015-07-14 2:01 Evan Teran
2016-05-27 23:11 Fabio Rossi
2016-08-05 7:29 Fabio Rossi
2016-08-17 12:38 Fabio Rossi
2016-08-17 12:38 Fabio Rossi
2017-06-25 21:43 Fabio Rossi
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox